zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 17:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added default sort #2741

Browse source
This commit is contained in:
Priit Tark 2015-07-28 21:02:09 +03:00
parent 3d43c53c9d
commit f43c6bbf98
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/pricelists_controller.rb
View file

@ -4,6 +4,7 @@ class Admin::PricelistsController < AdminController
def index def index
@q = Pricelist.search(params[:q]) @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]) @pricelists = @q.result.page(params[:page])
end end

6
app/views/admin/pricelists/index.haml
View file

@ -14,10 +14,10 @@
%tr %tr
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'category', t(:category)) = sort_link(@q, 'category', t(:category))
%th{class: 'col-xs-2'}
= sort_link(@q, 'operation_category', t(:operation))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'duration', t(:duration)) = sort_link(@q, 'duration', t(:duration))
%th{class: 'col-xs-2'}
= sort_link(@q, 'operation_category', t(:operation))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'price', t(:price)) = sort_link(@q, 'price', t(:price))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
@ -31,8 +31,8 @@
- @pricelists.each do |pricelist| - @pricelists.each do |pricelist|
%tr %tr
%td= pricelist.category %td= pricelist.category
%td= pricelist.operation_category
%td= pricelist.duration %td= pricelist.duration
%td= pricelist.operation_category
%td= pricelist.price %td= pricelist.price
%td= l(pricelist.valid_from, format: :ydate) %td= l(pricelist.valid_from, format: :ydate)
%td= l(pricelist.valid_to, format: :ydate) %td= l(pricelist.valid_to, format: :ydate)