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

Merge pull request #4579 from nonamethanks/fix_4564

Browse Source 
Upload limit: don't display progress in tooltip when maxed out
This commit is contained in:
evazion
2020-08-12 09:46:44 -05:00
committed by GitHub
parent a70c4a72e6 bc8fc1839f
commit 58179fce00
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/upload_limit.rb
View File

@@ -31,6 +31,10 @@ class UploadLimit
end
end
def maxed?
user.upload_points >= MAXIMUM_POINTS
end
def used_upload_slots
pending_count = user.posts.pending.count
appealed_count = user.post_appeals.pending.count

6
app/views/users/_upload_limit.html.erb
View File

@@ -4,7 +4,11 @@
none
<% else %>
<%= link_to user.upload_limit.used_upload_slots, posts_path(tags: "user:#{user.name} status:pending") %> /
<%= tag.abbr user.upload_limit.upload_slots, title: "#{pluralize(user.upload_limit.approvals_for_next_level - user.upload_limit.approvals_on_current_level, "approved post")} needed for next level (progress: #{user.upload_limit.approvals_on_current_level} / #{user.upload_limit.approvals_for_next_level}) " %>
<% if user.upload_limit.maxed? %>
<%= tag.abbr user.upload_limit.upload_slots, title: "Maximum amount of upload slots reached." %>
<% else %>
<%= tag.abbr user.upload_limit.upload_slots, title: "#{pluralize(user.upload_limit.approvals_for_next_level - user.upload_limit.approvals_on_current_level, "approved post")} needed for next level (progress: #{user.upload_limit.approvals_on_current_level} / #{user.upload_limit.approvals_for_next_level}) " %>
<% end %>
<% end %>
(<%= link_to_wiki "help", "about:upload_limits" %>)