From 62b44414130a4e1abd2d7b06357faedc2263c694 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 22 Mar 2013 21:39:35 -0400 Subject: [PATCH] upload limit changes --- app/models/user.rb | 2 +- app/presenters/user_presenter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index aa9b7a4a5..6cde300c6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -437,7 +437,7 @@ class User < ActiveRecord::Base 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, 1.year.ago).count - if base_upload_limit.to_i > 0 + if base_upload_limit.to_i != 0 limit = [base_upload_limit - (deleted_count / 2), 4].max - pending_count else limit = [10 + [approved_count / 2, 90].min - (deleted_count / 2), 4].max - pending_count diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb index 9a37ba2c0..ff752c4fa 100644 --- a/app/presenters/user_presenter.rb +++ b/app/presenters/user_presenter.rb @@ -42,7 +42,7 @@ class UserPresenter 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, 1.year.ago).count - if user.base_upload_limit + if user.base_upload_limit.to_i != 0 string = "max(base_upload_limit:#{user.base_upload_limit} - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}" else string = "max(10 + min(approved_count:#{approved_count} / 2, 90) - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}"