Merged r10490 from trunk to 2.1-stable (#11982, #11966)

explicitly define route at scm diff view.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10509 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/repositories/diff.html.erb b/app/views/repositories/diff.html.erb
index ecd19ccf8335243ff6ac71aa945cfcf185cf7265..6520a0fb57df242512e3d95b6551a75f597dc1ae 100644 (file)
--- a/app/views/repositories/diff.html.erb
+++ b/app/views/repositories/diff.html.erb
@@ -1,8 +1,9 @@
 <h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
 
 <!-- Choose view type -->
-<%= form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
-  <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
+<%= form_tag({:action => 'diff', :id => @project,
+              :repository_id => @repository.identifier_param,
+              :path => to_path_param(@path), :rev=> @rev}, :method => 'get') do %>
   <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
   <p>
     <label><%= l(:label_view_diff) %></label>