From 6c0aa5cb89ce8d965d5e0e1e8170161b42cda990 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 26 Sep 2018 07:47:59 +0000
Subject: [PATCH] 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
---
 app/helpers/application_helper.rb | 5 +++++
 app/helpers/timelog_helper.rb     | 6 ++++++
 app/views/timelog/edit.html.erb   | 1 +
 app/views/timelog/new.html.erb    | 1 +
 4 files changed, 13 insertions(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 62987ca29..215dca08c 100644
--- 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 89ed99601..7248e8ed0 100644
--- 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 89a60b7ed..f7daa26c3 100644
--- 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 593eb2bc8..719e79d96 100644
--- 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 %>
-- 
2.39.5