diff --git a/app/controllers/admin/pricelists_controller.rb b/app/controllers/admin/pricelists_controller.rb index 200d27e48..34dd1e783 100644 --- a/app/controllers/admin/pricelists_controller.rb +++ b/app/controllers/admin/pricelists_controller.rb @@ -4,6 +4,7 @@ class Admin::PricelistsController < AdminController def index @q = Pricelist.search(params[:q]) + @q.sorts = ['category asc', 'duration asc', 'operation_category asc', 'valid_from desc'] if @q.sorts.empty? @pricelists = @q.result.page(params[:page]) end diff --git a/app/views/admin/pricelists/index.haml b/app/views/admin/pricelists/index.haml index 6cf83f6b8..2f51a4329 100644 --- a/app/views/admin/pricelists/index.haml +++ b/app/views/admin/pricelists/index.haml @@ -14,10 +14,10 @@ %tr %th{class: 'col-xs-2'} = sort_link(@q, 'category', t(:category)) - %th{class: 'col-xs-2'} - = sort_link(@q, 'operation_category', t(:operation)) %th{class: 'col-xs-2'} = sort_link(@q, 'duration', t(:duration)) + %th{class: 'col-xs-2'} + = sort_link(@q, 'operation_category', t(:operation)) %th{class: 'col-xs-2'} = sort_link(@q, 'price', t(:price)) %th{class: 'col-xs-2'} @@ -31,8 +31,8 @@ - @pricelists.each do |pricelist| %tr %td= pricelist.category - %td= pricelist.operation_category %td= pricelist.duration + %td= pricelist.operation_category %td= pricelist.price %td= l(pricelist.valid_from, format: :ydate) %td= l(pricelist.valid_to, format: :ydate)