meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17522 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2018-09-26 07:47:59 +00:00
parent b9fa262165
commit 6c0aa5cb89
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/helpers/application_helper.rb
View File

@ -1307,6 +1307,11 @@ module ApplicationHelper
hidden_field_tag('back_url', url, :id => nil) unless url.blank? hidden_field_tag('back_url', url, :id => nil) unless url.blank?
end 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) def check_all_links(form_name)
link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") + link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
" | ".html_safe + " | ".html_safe +

6
app/helpers/timelog_helper.rb
View File

@ -114,4 +114,10 @@ module TimelogHelper
end end
end 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 end

1
app/views/timelog/edit.html.erb
View File

@ -3,4 +3,5 @@
<%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry), :html => {:multipart => true} do |f| %> <%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry), :html => {:multipart => true} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<%= submit_tag l(:button_save) %> <%= submit_tag l(:button_save) %>
<%= render_cancel_button_tag_for_time_entry(@project) %>
<% end %> <% end %>

1
app/views/timelog/new.html.erb
View File

@ -4,4 +4,5 @@
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<%= submit_tag l(:button_create) %> <%= submit_tag l(:button_create) %>
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %> <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
<%= render_cancel_button_tag_for_time_entry(@project) %>
<% end %> <% end %>