From a008e041d06098be692700057d4978da39bdc295 Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 23 Mar 2013 11:37:30 -0400 Subject: [PATCH] fixes #1044 --- app/models/user.rb | 8 ++++---- app/presenters/user_presenter.rb | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 82416b4c6..d818c59d9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -433,14 +433,14 @@ class User < ActiveRecord::Base end def upload_limit - deleted_count = Post.for_user(id).deleted.where("created_at >= ?", 3.months.ago).count - pending_count = Post.for_user(id).pending.where("created_at >= ?", 3.days.ago).count - approved_count = Post.where("is_flagged = false and is_pending = false and is_deleted = false and uploader_id = ? and created_at >= ?", id, 3.months.ago).count + deleted_count = Post.for_user(id).deleted.count + pending_count = Post.for_user(id).pending.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.to_i != 0 limit = [base_upload_limit - (deleted_count / 4), 4].max - pending_count else - limit = [10 + (approved_count / 2) - (deleted_count / 4), 4].max - pending_count + limit = [10 + (approved_count / 10) - (deleted_count / 4), 4].max - pending_count end if limit < 0 diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb index df6707de2..aa45b8ce5 100644 --- a/app/presenters/user_presenter.rb +++ b/app/presenters/user_presenter.rb @@ -38,17 +38,17 @@ class UserPresenter return "none" end - deleted_count = Post.for_user(user.id).deleted.where("created_at >= ?", 3.months.ago).count - pending_count = Post.for_user(user.id).pending.where("created_at >= ?", 3.days.ago).count - approved_count = Post.where("is_flagged = false and is_pending = false and is_deleted = false and uploader_id = ? and created_at >= ?", user.id, 3.months.ago).count + deleted_count = Post.for_user(user.id).deleted.count + pending_count = Post.for_user(user.id).pending.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.to_i != 0 - string = "max(base_upload_limit:#{user.base_upload_limit} - (deleted_count:#{deleted_count} / 4), 4) - pending_count:#{pending_count}" + string = "max(base:#{user.base_upload_limit} - (deleted:#{deleted_count} / 4), 4) - pending:#{pending_count}" else - string = "max(10 + (approved_count:#{approved_count} / 2) - (deleted_count:#{deleted_count} / 4), 4) - pending_count:#{pending_count}" + string = "max(10 + (approved:#{approved_count} / 10) - (deleted:#{deleted_count} / 4), 4) - pending:#{pending_count}" end - "#{string} = #{user.upload_limit} (deletions + approved within past 3 months)" + "#{string} = #{user.upload_limit}" end def uploads