use sendmail mailer in production

This commit is contained in:
albert 2013-02-23 18:17:42 -05:00
parent 7dd4d8a313
commit 8bf842ae99
4 changed files with 9 additions and 2 deletions

View File

@ -0,0 +1,5 @@
div#c-maintenance-user-login-reminders {
div#a-new {
width: 50em;
}
}

View File

@ -396,7 +396,7 @@ class User < ActiveRecord::Base
def upload_limit
deleted_count = Post.for_user(id).deleted.count
pending_count = Post.for_user(id).pending.count
approved_count = Post.where("is_pending = false and is_deleted = false and uploader_id = ?", id).count
approved_count = Post.where("is_flagged = false and is_pending = false and is_deleted = false and uploader_id = ?", id).count
if base_upload_limit
limit = base_upload_limit - pending_count

View File

@ -48,7 +48,7 @@ class UserPresenter
deleted_count = Post.for_user(user.id).deleted.count
pending_count = Post.for_user(user.id).pending.count
approved_count = Post.where("is_pending = false and is_deleted = false and uploader_id = ?", user.id).count
approved_count = Post.where("is_flagged = false and is_pending = false and is_deleted = false and uploader_id = ?", user.id).count
if user.base_upload_limit
limit = user.base_upload_limit - pending_count

View File

@ -64,4 +64,6 @@ Danbooru::Application.configure do
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
# config.active_record.auto_explain_threshold_in_seconds = 0.5
config.action_mailer.delivery_method = :sendmail
end