Merge branch 'filter-datatables' of https://github.com/ZeusWPI/Tab into filter-datatables

This commit is contained in:
benji 2015-09-11 15:50:10 +02:00
commit b67e0954e3
2 changed files with 2 additions and 1 deletions

View file

@ -30,7 +30,7 @@ class DataTable
end
def query
q = @transactions.query
q = @transactions.query.order(@table[:time].desc)
q.where(predicate) if predicate
q
end

View file

@ -12,6 +12,7 @@ class TransactionsQuery
def query
Arel::SelectManager.new(ActiveRecord::Base)
.from(arel)
.order(@arel_table[:time].desc)
end
def arel