From bc8fc1839f912da0aac71ca7127d15a20c8c7bcd Mon Sep 17 00:00:00 2001 From: nonamethanks Date: Tue, 11 Aug 2020 04:24:16 +0200 Subject: [PATCH] Upload limit: don't display progress when maxed out --- app/logical/upload_limit.rb | 4 ++++ app/views/users/_upload_limit.html.erb | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/logical/upload_limit.rb b/app/logical/upload_limit.rb index 752741d05..df8670d57 100644 --- a/app/logical/upload_limit.rb +++ b/app/logical/upload_limit.rb @@ -30,6 +30,10 @@ class UploadLimit end end + def maxed? + user.upload_points >= MAXIMUM_POINTS + end + def used_upload_slots pending = user.posts.pending early_deleted = user.posts.deleted.where("created_at >= ?", 3.days.ago) diff --git a/app/views/users/_upload_limit.html.erb b/app/views/users/_upload_limit.html.erb index 60fd44afa..43707f90d 100644 --- a/app/views/users/_upload_limit.html.erb +++ b/app/views/users/_upload_limit.html.erb @@ -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" %>)