From 0806bf13df7c801635971ccf250747e4451503c7 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Tue, 20 Jan 2009 15:58:55 -0800 Subject: [PATCH] Added a standard form for adding a new rate based on the membership row. #1921 --- app/views/users/_memberships.rhtml | 16 +++++++++++++--- lang/en.yml | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml index c64cc0b..df24f41 100644 --- a/app/views/users/_memberships.rhtml +++ b/app/views/users/_memberships.rhtml @@ -25,16 +25,26 @@ <%# TODO: Hook %> <% rate = Rate.for(@user, membership.project) %> - + <% if rate.default? || rate.nil? %> <% if rate.default? %> <%= number_to_currency(rate.amount) %> <% end %> - [ Set Rate Form ] + + <% form_for(:rate, :url => rates_path) do |f| %> + + <%= f.text_field :amount %> + <%= f.hidden_field :date_in_effect, :value => Date.today.to_s %> + <%= f.hidden_field :project_id, :value => membership.project.id %> + <%= f.hidden_field :user_id, :value => @user.id %> + <%= hidden_field_tag "back_url", url_for(:controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships') %> + + <%= submit_tag(l(:rate_label_set_rate), :class => "small") %> + <% end %> <% else %> <%= link_to number_to_currency(rate.amount), { :action => 'edit', :id => @user, :tab => 'rates'} %> <% end %> - + diff --git a/lang/en.yml b/lang/en.yml index 4a9629b..d731175 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -5,3 +5,5 @@ rate_label_rate_history: Rate History rate_label_new_rate: New Rate rate_label_currency: $ rate_error_user_not_found: User not found +rate_label_set_rate: Set Rate +