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

Upload limit: don't display progress when maxed out

Browse Source
This commit is contained in:
nonamethanks
2020-08-11 04:24:16 +02:00
parent afc07d8adf
commit bc8fc1839f
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

@@ -30,6 +30,10 @@ class UploadLimit
end end
end end
def maxed?
user.upload_points >= MAXIMUM_POINTS
end
def used_upload_slots def used_upload_slots
pending = user.posts.pending pending = user.posts.pending
early_deleted = user.posts.deleted.where("created_at >= ?", 3.days.ago) early_deleted = user.posts.deleted.where("created_at >= ?", 3.days.ago)

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

@@ -4,7 +4,11 @@
none none
<% else %> <% else %>
<%= link_to user.upload_limit.used_upload_slots, posts_path(tags: "user:#{user.name} status:pending") %> / <%= 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 %> <% end %>
(<%= link_to_wiki "help", "about:upload_limits" %>) (<%= link_to_wiki "help", "about:upload_limits" %>)