diff --git a/app/controllers/admin/setting_groups_controller.rb b/app/controllers/admin/setting_groups_controller.rb index 373e32858..092aaa8be 100644 --- a/app/controllers/admin/setting_groups_controller.rb +++ b/app/controllers/admin/setting_groups_controller.rb @@ -2,7 +2,8 @@ class Admin::SettingGroupsController < ApplicationController before_action :set_setting_group, only: [:show, :update] def index - @setting_groups = SettingGroup.all + @q = SettingGroup.search(params[:q]) + @setting_groups = @q.result.page(params[:page]) end def show; end diff --git a/app/views/admin/setting_groups/index.haml b/app/views/admin/setting_groups/index.haml index 14792d48b..9c3fc87a1 100644 --- a/app/views/admin/setting_groups/index.haml +++ b/app/views/admin/setting_groups/index.haml @@ -2,13 +2,14 @@ %hr .row .col-md-12 - %table.table.table-striped.table-bordered - %tr - %th{class: 'col-xs-9'} - = t('shared.setting_group') - %th{class: 'col-xs-2'} - = t('shared.action') - - @setting_groups.each do |x| + .table-responsive + %table.table.table-striped.table-bordered.table-condensed %tr - %td= t("setting_groups.codes.#{x.code}") - %td= link_to(t('shared.edit_settings'), admin_setting_group_path(x), class: 'btn btn-primary btn-xs') + %th{class: 'col-xs-9'} + = sort_link(@q, 'code', t('shared.setting_group')) + %th{class: 'col-xs-2'} + = t('shared.action') + - @setting_groups.each do |x| + %tr + %td= t("setting_groups.codes.#{x.code}") + %td= link_to(t('shared.edit_settings'), admin_setting_group_path(x), class: 'btn btn-primary btn-xs') diff --git a/app/views/admin/setting_groups/show.haml b/app/views/admin/setting_groups/show.haml index e972e5994..2a15d78dc 100644 --- a/app/views/admin/setting_groups/show.haml +++ b/app/views/admin/setting_groups/show.haml @@ -3,17 +3,18 @@ = form_for([:admin, @setting_group]) do |f| .row .col-md-12 - %table.table.table-striped.table-bordered - %tr - %th{class: 'col-xs-9'} - = t('setting') - %th{class: 'col-xs-2'} - = t('value') - - @setting_group.settings.each do |setting| - = f.fields_for :settings, setting do |sf| - %tr - %td= sf.label :value, t("settings.codes.#{sf.object.code}") - %td= sf.text_field(:value, autocomplete: 'off') + .table-responsive + %table.table.table-striped.table-bordered.table-condensed + %tr + %th{class: 'col-xs-9'} + = t('shared.setting') + %th{class: 'col-xs-2'} + = t('shared.value') + - @setting_group.settings.order(:code).each do |setting| + = f.fields_for :settings, setting do |sf| + %tr + %td= sf.label :value, t("settings.codes.#{sf.object.code}") + %td= sf.text_field(:value, autocomplete: 'off') .row .col-md-12.text-right %button.btn.btn-primary=t('shared.save')