Fixed regression problem of entries not being marked for billing anymore
This commit is contained in:
parent
79e9190956
commit
32cea1211d
|
@ -934,6 +934,9 @@ module StopTime::Controllers
|
||||||
# the timeline using Views#time_entries
|
# the timeline using Views#time_entries
|
||||||
def get
|
def get
|
||||||
@time_entries = TimeEntry.all(:order => "start DESC")
|
@time_entries = TimeEntry.all(:order => "start DESC")
|
||||||
|
@time_entries.each do |te|
|
||||||
|
@input["bill_#{te.id}"] = true if te.bill?
|
||||||
|
end
|
||||||
@customer_list = Customer.all.map do |c|
|
@customer_list = Customer.all.map do |c|
|
||||||
[c.id, c.short_name.present? ? c.short_name : c.name]
|
[c.id, c.short_name.present? ? c.short_name : c.name]
|
||||||
end
|
end
|
||||||
|
@ -1291,8 +1294,7 @@ module StopTime::Views
|
||||||
td { entry.comment }
|
td { entry.comment }
|
||||||
td { "%.2fh" % entry.hours_total }
|
td { "%.2fh" % entry.hours_total }
|
||||||
td do
|
td do
|
||||||
_form_input_checkbox("bill_#{entry.id}", entry.bill,
|
_form_input_checkbox("bill_#{entry.id}", true, :disabled => true)
|
||||||
:disabled => true)
|
|
||||||
end
|
end
|
||||||
td do
|
td do
|
||||||
form :action => R(TimelineN, entry.id), :method => :post do
|
form :action => R(TimelineN, entry.id), :method => :post do
|
||||||
|
|
Loading…
Reference in New Issue