diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 029f9cf29..c95ad0bcd 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.sort_by{|e| e["index"]} + @navbar = default_laboratory.navbar.sort_by{|e| e["index"].to_i } # 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/views/admins/laboratory_settings/_add_tr.html.erb b/app/views/admins/laboratory_settings/_add_tr.html.erb index 2d6ff25d5..d80419fa0 100644 --- a/app/views/admins/laboratory_settings/_add_tr.html.erb +++ b/app/views/admins/laboratory_settings/_add_tr.html.erb @@ -1,6 +1,7 @@ <%= text_field_tag('navbar[][name]', "", id: nil, class: 'form-control', placeholder: "导航名称") %> <%= text_field_tag('navbar[][link]', "", id: nil, class: 'form-control', placeholder: "导航链接") %> + <%= number_field_tag('navbar[][index]', "", id: nil, class: 'form-control', placeholder: "顺序") %> <%= check_box_tag('navbar[][hidden]', 0, false, id: nil, class: 'font-16') %> diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb index d3d3002bf..088c281cb 100644 --- a/app/views/admins/laboratory_settings/show.html.erb +++ b/app/views/admins/laboratory_settings/show.html.erb @@ -165,11 +165,11 @@ - <% (setting.navbar || setting.default_navbar).sort_by{|e| e["index"]}.each do |nav| %> + <% (setting.navbar || setting.default_navbar).sort_by{|e| e["index"].to_i }.each do |nav| %> <%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %> <%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %> - <%= text_field_tag('navbar[][index]', nav['index'], id: nil, class: 'form-control') %> + <%= number_field_tag('navbar[][index]', nav['index'], id: nil, class: 'form-control') %> <%= check_box_tag('navbar[][hidden]', 0, !nav['hidden'], id: nil, class: 'font-16') %>