Add cancel button to new/edit log time page (#8888).

Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17522 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 62987ca29c9b9f77d526f754a3d090dbd4800eff..215dca08c9faa6ef8afe1942afe47a0db3cc571b 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1307,6 +1307,11 @@ module ApplicationHelper
     hidden_field_tag('back_url', url, :id => nil) unless url.blank?
   end
 
+  def render_cancel_button_tag(fallback_url)
+    url = back_url.blank? ? fallback_url : back_url
+    link_to l(:button_cancel), url
+  end
+
   def check_all_links(form_name)
     link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
     " | ".html_safe +

diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index 89ed99601bab208ddd48d05f1952d3642c5a1564..7248e8ed0f2ae7b5998a49d1820ae55dcf24f26d 100644 (file)
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -114,4 +114,10 @@ module TimelogHelper
       end
     end
   end
+
+  def render_cancel_button_tag_for_time_entry(project)
+    fallback_path = project ? project_time_entries_path(project) : time_entries_path
+    render_cancel_button_tag(fallback_path)
+  end
+
 end

diff --git a/app/views/timelog/edit.html.erb b/app/views/timelog/edit.html.erb
index 89a60b7ed341d886ff59df3caf922bb5008f3dee..f7daa26c375d318a38a2f4a168ea69e0f94360c5 100644 (file)
--- a/app/views/timelog/edit.html.erb
+++ b/app/views/timelog/edit.html.erb
@@ -3,4 +3,5 @@
 <%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry), :html => {:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_save) %>
+  <%= render_cancel_button_tag_for_time_entry(@project) %>
 <% end %>

diff --git a/app/views/timelog/new.html.erb b/app/views/timelog/new.html.erb
index 593eb2bc8d2f813ee32a77abeba267765d6b4986..719e79d967e0c2a4a51fe07450c3a8b31866f2e3 100644 (file)
--- a/app/views/timelog/new.html.erb
+++ b/app/views/timelog/new.html.erb
@@ -4,4 +4,5 @@
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_create) %>
   <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+  <%= render_cancel_button_tag_for_time_entry(@project) %>
 <% end %>