lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issue with visibility redirected and changed the 'no recordings' string for the recordings page (#361)

This commit is contained in:
farhatahmad 2019-02-06 12:02:53 -05:00 committed by Jesus Federico
parent 16def655cf
commit 9883616f9c
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/rooms_controller.rb
View File

@ -168,7 +168,9 @@ class RoomsController < ApplicationController
}
res = @room.update_recording(params[:record_id], meta)
redirect_to @room if res[:updated]
# Redirects to the page that made the initial request
redirect_to request.referrer if res[:updated]
end
# DELETE /:room_uid/:record_id

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

@ -71,4 +71,4 @@
</div>
</div>
<%= render "shared/sessions", recordings: @recordings, only_public: false %>
<%= render "shared/sessions", recordings: @recordings, only_public: false, user_recordings: false %>

2
app/views/shared/_room_event.html.erb
View File

@ -40,4 +40,4 @@
</div>
</div>
<%= render "shared/sessions", recordings: @room.public_recordings, only_public: true %>
<%= render "shared/sessions", recordings: @room.public_recordings, only_public: true, user_recordings: false %>

6
app/views/shared/_sessions.html.erb
View File

@ -50,7 +50,11 @@
<% if recordings.empty? %>
<tr>
<td colspan="7" class="text-center h4 p-6 font-weight-normal">
<%= t("recording.no_recordings", inject: only_public ? t("recording.visibility.public").downcase + " " : "") %>
<% if user_recordings %>
<%= t("recording.no_user_recordings") %>
<% else %>
<%= t("recording.no_recordings", inject: only_public ? t("recording.visibility.public").downcase + " " : "") %>
<% end %>
</td>
</tr>
<% else %>

2
app/views/users/recordings.html.erb
View File

@ -18,4 +18,4 @@
# without losing all css
%>
<%= render "shared/sessions", recordings: @recordings, only_public: false %>
<%= render "shared/sessions", recordings: @recordings, only_public: false, user_recordings: true %>

1
config/locales/en.yml
View File

@ -146,6 +146,7 @@ en:
recording:
email: Email Recording
no_recordings: This room has no %{inject}recordings.
no_user_recordings: You currently have no recordings.
no_matched_recordings: No %{inject} recordings match your search.
recorded_on: Recorded on %{date}
table: