Also order unbilled tasks descending by date in the time_entries view
This commit is contained in:
parent
dc9aaca602
commit
167c8d1b99
|
@ -1185,7 +1185,9 @@ module StopTime::Controllers
|
||||||
if @input["show"] == "all"
|
if @input["show"] == "all"
|
||||||
@time_entries = TimeEntry.all(:order => "start DESC")
|
@time_entries = TimeEntry.all(:order => "start DESC")
|
||||||
else
|
else
|
||||||
@time_entries = TimeEntry.joins(:task).where("stoptime_tasks.invoice_id" => nil)
|
@time_entries = TimeEntry.joins(:task)\
|
||||||
|
.where("stoptime_tasks.invoice_id" => nil)\
|
||||||
|
.order("start DESC")
|
||||||
end
|
end
|
||||||
@time_entries.each do |te|
|
@time_entries.each do |te|
|
||||||
@input["bill_#{te.id}"] = true if te.bill?
|
@input["bill_#{te.id}"] = true if te.bill?
|
||||||
|
|
Loading…
Reference in New Issue