diff options
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/timelog_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/timelog/edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/new.html.erb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 215dca08c..da06e2b6a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1307,7 +1307,7 @@ module ApplicationHelper hidden_field_tag('back_url', url, :id => nil) unless url.blank? end - def render_cancel_button_tag(fallback_url) + def cancel_button_tag(fallback_url) url = back_url.blank? ? fallback_url : back_url link_to l(:button_cancel), url end diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index 7248e8ed0..9cdfa9c13 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -115,9 +115,9 @@ module TimelogHelper end end - def render_cancel_button_tag_for_time_entry(project) + def cancel_button_tag_for_time_entry(project) fallback_path = project ? project_time_entries_path(project) : time_entries_path - render_cancel_button_tag(fallback_path) + cancel_button_tag(fallback_path) end end diff --git a/app/views/timelog/edit.html.erb b/app/views/timelog/edit.html.erb index f7daa26c3..3cc96dfd0 100644 --- a/app/views/timelog/edit.html.erb +++ b/app/views/timelog/edit.html.erb @@ -3,5 +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) %> + <%= 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 719e79d96..9ec89d52a 100644 --- a/app/views/timelog/new.html.erb +++ b/app/views/timelog/new.html.erb @@ -4,5 +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) %> + <%= cancel_button_tag_for_time_entry(@project) %> <% end %> |