diff --git a/app/controllers/admins/laboratory_settings_controller.rb b/app/controllers/admins/laboratory_settings_controller.rb index 861db50c6..d522a479b 100644 --- a/app/controllers/admins/laboratory_settings_controller.rb +++ b/app/controllers/admins/laboratory_settings_controller.rb @@ -25,6 +25,6 @@ class Admins::LaboratorySettingsController < Admins::BaseController params.permit(:identifier, :name, :nav_logo, :login_logo, :tab_logo, :oj_banner, :subject_banner, :course_banner, :competition_banner, :moop_cases_banner, - :footer, navbar: %i[name link hidden]) + :footer, navbar: %i[name link hidden index]) end end \ No newline at end of file diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 92a4afd21..029f9cf29 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -28,7 +28,7 @@ class SettingsController < ApplicationController private def get_navbar - @navbar = default_laboratory.navbar + @navbar = default_laboratory.navbar.sort_by{|e| e["index"]} # if User.current.logged? # pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "#{Rails.application.config_for(:configuration)['platform_url']}/current_user"), "hidden"=>false} # @navbar << pernal_index diff --git a/app/services/admins/save_laboratory_setting_service.rb b/app/services/admins/save_laboratory_setting_service.rb index c29e374bd..ad040585f 100644 --- a/app/services/admins/save_laboratory_setting_service.rb +++ b/app/services/admins/save_laboratory_setting_service.rb @@ -30,6 +30,7 @@ class Admins::SaveLaboratorySettingService < ApplicationService hash = {} hash[:name] = strip nav[:name] hash[:link] = strip nav[:link] + hash[:index] = strip nav[:index] hash[:hidden] = nav[:hidden].to_s != '0' hash end diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb index 8cf2d4cbf..d3d3002bf 100644 --- a/app/views/admins/laboratory_settings/show.html.erb +++ b/app/views/admins/laboratory_settings/show.html.erb @@ -16,9 +16,9 @@ https:// <%= text_field_tag :identifier, @laboratory.identifier, - maxlength: 15, class: 'form-control font-16', - 'onKeyUp': 'value=value.replace(/[^\w\-\/]/ig,"").toLowerCase()', - style: 'text-transform:lowercase'%> + maxlength: 15, class: 'form-control font-16', + 'onKeyUp': 'value=value.replace(/[^\w\-\/]/ig,"").toLowerCase()', + style: 'text-transform:lowercase'%>