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

* General bug fixes and improvements for 2.3

* Removed mins change

* Removed mins change rspec

app/controllers/admins_controller.rb

@@ -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

app/helpers/admins_helper.rb

@@ -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
 

app/views/admins/components/_settings.html.erb

@@ -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>

config/locales/en.yml

@@ -49,8 +49,6 @@ en:
         lighten: Lighten
         darken: Darken
       recording_visibility:
-        public: Public
-        private: Private
         info: Set the default recording visbility for new recordings
         title: Recording Default Visibility
         warning: This setting will only be applied to rooms that aren't running

spec/controllers/admins_controller_spec.rb

@@ -327,7 +327,7 @@ describe AdminsController, type: :controller do
         feature = Setting.find_by(provider: "provider1").features.find_by(name: "Default Recording Visibility")
 
         expect(feature[:value]).to eq("public")
-        expect(response).to redirect_to(admins_path)
+        expect(response).to redirect_to(admin_site_settings_path)
       end
     end
   end