From fbc7d8f5926145be36d1721def0d6359b4a76347 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 21 Jun 2010 14:29:23 -0700 Subject: [PATCH] [#4177] Update the cancel link to redirect to the list or show page. --- app/views/contracts/_form.html.erb | 2 +- app/views/contracts/edit.html.erb | 2 +- app/views/contracts/new.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/contracts/_form.html.erb b/app/views/contracts/_form.html.erb index 1bcc744..1070c47 100644 --- a/app/views/contracts/_form.html.erb +++ b/app/views/contracts/_form.html.erb @@ -17,7 +17,7 @@ <% end %> <% form.buttons do %> <%= form.commit_button %> - <%= link_to(l(:button_cancel), contracts_path) %> + <%= link_to(l(:button_cancel), cancel_path) %> <% end %> <%= wikitoolbar_for 'contract_discount_note' %> diff --git a/app/views/contracts/edit.html.erb b/app/views/contracts/edit.html.erb index 883d7c0..f0d8c54 100644 --- a/app/views/contracts/edit.html.erb +++ b/app/views/contracts/edit.html.erb @@ -1,7 +1,7 @@ <%= content_tag(:h2, h(resource.name)) %> <% semantic_form_for resource, :url => contract_path(@project, resource), :html => {:class => 'tabular'} do |form| %> -<%= render :partial => 'form', :object => form %> +<%= render :partial => 'form', :object => form, :locals => {:cancel_path => contract_path(@project, resource)} %> <% end %> <% content_for(:header_tags) do %> diff --git a/app/views/contracts/new.html.erb b/app/views/contracts/new.html.erb index 1d02069..5ec1901 100644 --- a/app/views/contracts/new.html.erb +++ b/app/views/contracts/new.html.erb @@ -1,7 +1,7 @@ <%= content_tag(:h2, l(:text_new_contract)) %> <% semantic_form_for resource, :html => {:class => 'tabular'} do |form| %> -<%= render :partial => 'form', :object => form %> +<%= render :partial => 'form', :object => form, :locals => {:cancel_path => contracts_path} %> <% end %> <% content_for(:header_tags) do %>