diff --git a/app/views/deliverables/_finance_form.html.erb b/app/views/deliverables/_finance_form.html.erb index 0942953..23e2798 100644 --- a/app/views/deliverables/_finance_form.html.erb +++ b/app/views/deliverables/_finance_form.html.erb @@ -85,6 +85,12 @@
<%= fixed_budget.text_field(:markup) %> ++ <%= fixed_budget.label(:paid, l(:field_paid), :style => 'display: none;') %><%# Hidden label :| %> + <%= l(:field_paid) %> +
+ <%= fixed_budget.check_box(:paid) %> + <%= fixed_budget.text_area(:description, :class => 'wiki-edit', :rows => '5', :id => "fixed-description#{fixed_budget.object.object_id}") %> <%= wikitoolbar_for "fixed-description#{fixed_budget.object.object_id}" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 5dd440e..c01cc94 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -72,3 +72,4 @@ en: text_flash_deliverable_destroyed: "Deliverable: {{name}} was successfully destroyed." field_budget: Budget field_markup: Markup + field_paid: Paid diff --git a/db/migrate/017_add_paid_to_fixed_budgets.rb b/db/migrate/017_add_paid_to_fixed_budgets.rb new file mode 100644 index 0000000..3508ff5 --- /dev/null +++ b/db/migrate/017_add_paid_to_fixed_budgets.rb @@ -0,0 +1,10 @@ +class AddPaidToFixedBudgets < ActiveRecord::Migration + def self.up + add_column :fixed_budgets, :paid, :boolean + add_index :fixed_budgets, :paid + end + + def self.down + remove_column :fixed_budgets, :paid + end +end diff --git a/test/integration/deliverables_edit_test.rb b/test/integration/deliverables_edit_test.rb index b139622..c7fd8fc 100644 --- a/test/integration/deliverables_edit_test.rb +++ b/test/integration/deliverables_edit_test.rb @@ -406,9 +406,11 @@ class DeliverablesEditTest < ActionController::IntegrationTest # * fixed title # * fixed budget # * fixed markup + # * fixed paid checkbox + # * fixed paid hidden field # * total (hidden) assert_select ".date-2010-01" do - assert_select "input", :count => 14 + assert_select "input", :count => 16 assert_select "textarea.wiki-edit", :count => 1 # Fixed description end