dinislage/redmine_contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 6636-deliverable-report

Browse Source
This commit is contained in:
Eric Davis
2011-11-14 11:13:19 -08:00
parent 62c74885b5 6957c8a114
commit 492435d560
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/deliverables/_finance_form.html.erb
View File

@@ -26,7 +26,7 @@
<%= content_tag(:label, l(:field_labor)) %> <%= content_tag(:label, l(:field_labor)) %>
<table id="deliverable-labor" class="deliverable_finance_table"> <table id="deliverable-labor" class="deliverable_finance_table">
<tbody> <tbody>
<% form.fields_for :labor_budgets, labor_budgets.sort_by(&:id) do |labor_budget| %> <% form.fields_for :labor_budgets, labor_budgets.sort_by {|b| b.id || 0 } do |labor_budget| %>
<%= render :partial => 'labor_budget_form', :locals => {:labor_budget => labor_budget} %> <%= render :partial => 'labor_budget_form', :locals => {:labor_budget => labor_budget} %>
<% end %> <% end %>
</tbody> </tbody>
@@ -37,7 +37,7 @@
<%= content_tag(:label, l(:field_overhead)) %> <%= content_tag(:label, l(:field_overhead)) %>
<table id="deliverable-overhead" class="deliverable_finance_table"> <table id="deliverable-overhead" class="deliverable_finance_table">
<tbody> <tbody>
<% form.fields_for :overhead_budgets, overhead_budgets.sort_by(&:id) do |overhead_budget| %> <% form.fields_for :overhead_budgets, overhead_budgets.sort_by {|b| b.id || 0 } do |overhead_budget| %>
<%= render :partial => 'overhead_budget_form', :locals => {:overhead_budget => overhead_budget} %> <%= render :partial => 'overhead_budget_form', :locals => {:overhead_budget => overhead_budget} %>
<% end %> <% end %>
</tbody> </tbody>
@@ -48,7 +48,7 @@
<div id="deliverable-fixed" class="fixed-item-form"> <div id="deliverable-fixed" class="fixed-item-form">
<label for="contract_discount">Fixed</label> <label for="contract_discount">Fixed</label>
<% form.fields_for :fixed_budgets, fixed_budgets.sort_by(&:id) do |fixed_budget| %> <% form.fields_for :fixed_budgets, fixed_budgets.sort_by {|b| b.id || 0 } do |fixed_budget| %>
<%= render :partial => 'fixed_budget_form', :locals => {:fixed_budget => fixed_budget} %> <%= render :partial => 'fixed_budget_form', :locals => {:fixed_budget => fixed_budget} %>
<%= wikitoolbar_for "fixed-description#{fixed_budget.object.object_id}" %> <%= wikitoolbar_for "fixed-description#{fixed_budget.object.object_id}" %>
<% end %> <% end %>