jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upload limit tweaks

Browse Source
This commit is contained in:
albert
2013-03-22 23:03:27 -04:00
parent 62b4441413
commit b54759b74b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@@ -440,7 +440,7 @@ class User < ActiveRecord::Base
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 limit = [base_upload_limit - (deleted_count / 2), 4].max - pending_count
else else
limit = [10 + [approved_count / 2, 90].min - (deleted_count / 2), 4].max - pending_count limit = [10 + [approved_count / 2, 90].min - ([deleted_count / 10, 90].min), 4].max - pending_count
end end
if limit < 0 if limit < 0

2
app/presenters/user_presenter.rb
View File

@@ -45,7 +45,7 @@ class UserPresenter
if user.base_upload_limit.to_i != 0 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}" string = "max(base_upload_limit:#{user.base_upload_limit} - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}"
else else
string = "max(10 + min(approved_count:#{approved_count} / 2, 90) - (deleted_count:#{deleted_count} / 2), 4) - pending_count:#{pending_count}" string = "max(10 + min(approved_count:#{approved_count} / 2, 90) - (min(deleted_count:#{deleted_count} / 10), 90), 4) - pending_count:#{pending_count}"
end end
"#{string} = #{user.upload_limit} (deletions and approvals within past month)" "#{string} = #{user.upload_limit} (deletions and approvals within past month)"