merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Include shared rooms in room count for search (#2470)

This commit is contained in:
Ahmad Farhat 2021-01-25 20:14:33 -05:00 committed by GitHub
parent e383102187
commit 0833491f41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/rooms_helper.rb
View File

@ -59,4 +59,11 @@ module RoomsHelper
def hidden_format_public def hidden_format_public
ENV.fetch("HIDDEN_FORMATS_PUBLIC", "").split(",") ENV.fetch("HIDDEN_FORMATS_PUBLIC", "").split(",")
end end
# Returns the total number of visibile rooms for the current user
def total_room_count(user)
total = user.rooms.length
total += user.shared_rooms.length if shared_access_allowed
total
end
end end

2
app/views/rooms/show.html.erb
View File

@ -82,7 +82,7 @@
</div> </div>
</div> </div>
<% if current_user.ordered_rooms.length > 5 %> <% if total_room_count(current_user) > 5 %>
<div class="input-icon invite-link-input mb-3"> <div class="input-icon invite-link-input mb-3">
<span class="input-icon-addon"> <span class="input-icon-addon">
<i class="fas fa-search"></i> <i class="fas fa-search"></i>