Commit 6f995911 authored by jplang's avatar jplang

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

Patch by Marius BALTEANU.

git-svn-id: https://svn.redmine.org/redmine/trunk@17522 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 5c03dbf3
......@@ -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 +
......
......@@ -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
......@@ -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 %>
......@@ -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 %>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment