diff --git a/app/models/user.rb b/app/models/user.rb index d2a283523..bcf1a8d19 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -440,7 +440,7 @@ class User < ActiveRecord::Base if base_upload_limit limit = [base_upload_limit - (deleted_count / 2), 4].max - pending_count else - limit = [10 + [approved_count / 2, 20].min - (deleted_count / 2), 4].max - pending_count + limit = [10 + [approved_count / 2, 30].min - (deleted_count / 2), 4].max - pending_count end if limit < 0 diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb index 9c756667a..d40cbfb78 100644 --- a/app/presenters/user_presenter.rb +++ b/app/presenters/user_presenter.rb @@ -45,7 +45,7 @@ class UserPresenter if base_upload_limit string = "max(base_upload_limit:#{base_upload_limit} - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}" else - string = "max(10 + min(approved_count:#{approved_count} / 2, 20) - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}" + string = "max(10 + min(approved_count:#{approved_count} / 2, 30) - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}" end "#{string} = #{user.upload_limit} (deletions and approvals within past month)"