Removes render_ prefix from cancel_button_tag methods (#8888).

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 215dca08c9faa6ef8afe1942afe47a0db3cc571b..da06e2b6a040ce8a0ebaa8a25436e58171e09f94 100644 (file)
--- 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 7248e8ed0f2ae7b5998a49d1820ae55dcf24f26d..9cdfa9c13f98ddc6a5fce494b9dd5c851d4691a3 100644 (file)
--- 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 f7daa26c375d318a38a2f4a168ea69e0f94360c5..3cc96dfd0268fda0131c7c4e94bb03fd43e0171f 100644 (file)
--- 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 719e79d967e0c2a4a51fe07450c3a8b31866f2e3..9ec89d52aeaf918abfaf5b9071afc9ef94c52d9c 100644 (file)
--- 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 %>