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

GRN2-xx: General bug fixes and improvements for 2.3 (#701)

Browse Source 
* General bug fixes and improvements for 2.3

* Removed mins change

* Removed mins change rspec
This commit is contained in:
farhatahmad
2019-07-31 11:33:29 -04:00
committed by Jesus Federico
parent 58201d5763
commit 5f237194b1
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admins_controller.rb
View File

@ -179,8 +179,10 @@ class AdminsController < ApplicationController
# POST /admins/default_recording_visibility
def default_recording_visibility
@settings.update_value("Default Recording Visibility", params[:visibility])
redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") + ". " +
I18n.t("administrator.site_settings.recording_visibility.warning") }
redirect_to admin_site_settings_path, flash: {
success: I18n.t("administrator.flash.settings") + ". " +
I18n.t("administrator.site_settings.recording_visibility.warning")
}
end
private

4
app/helpers/admins_helper.rb
View File

@ -58,9 +58,9 @@ module AdminsHelper
def recording_default_visibility_string
if Setting.find_or_create_by!(provider: user_settings_provider)
.get_value("Default Recording Visibility") == "public"
I18n.t("administrator.site_settings.recording_visibility.public")
I18n.t("recording.visibility.public")
else
I18n.t("administrator.site_settings.recording_visibility.private")
I18n.t("recording.visibility.unlisted")
end
end

4
app/views/admins/components/_settings.html.erb
View File

@ -110,10 +110,10 @@
</button>
<div class="dropdown-menu" aria-labelledby="room-auth">
<%= button_to admin_recording_visibility_path(visibility: "public"), class: "dropdown-item" do %>
<%= t("administrator.site_settings.recording_visibility.public") %>
<%= t("recording.visibility.public") %>
<% end %>
<%= button_to admin_recording_visibility_path(visibility: "private"), class: "dropdown-item" do %>
<%= t("administrator.site_settings.recording_visibility.private") %>
<%= t("recording.visibility.unlisted") %>
<% end %>
</div>
</div>