##// END OF EJS Templates
Fixed: path parameter is not an array when changing diff style (#2695), broken by r2317....
Jean-Philippe Lang -
r2360:b998572def6d
parent child
Show More
@@ -1,26 +1,23
1 <h2><%= l(:label_revision) %> <%= format_revision(@rev) %> <%= @path.gsub(/^.*\//, '') %></h2>
1 <h2><%= l(:label_revision) %> <%= format_revision(@rev) %> <%= @path.gsub(/^.*\//, '') %></h2>
2
2
3 <!-- Choose view type -->
3 <!-- Choose view type -->
4 <% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
4 <% form_tag({}, :method => 'get') do %>
5 <% params.each do |k, p| %>
5 <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
6 <% if k != "type" %>
6 <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
7 <%= hidden_field_tag(k,p) %>
8 <% end %>
9 <% end %>
10 <p><label><%= l(:label_view_diff) %></label>
7 <p><label><%= l(:label_view_diff) %></label>
11 <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
8 <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
12 <% end %>
9 <% end %>
13
10
14 <% cache(@cache_key) do -%>
11 <% cache(@cache_key) do -%>
15 <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
12 <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
16 <% end -%>
13 <% end -%>
17
14
18 <% other_formats_links do |f| %>
15 <% other_formats_links do |f| %>
19 <%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
16 <%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
20 <% end %>
17 <% end %>
21
18
22 <% html_title(with_leading_slash(@path), 'Diff') -%>
19 <% html_title(with_leading_slash(@path), 'Diff') -%>
23
20
24 <% content_for :header_tags do %>
21 <% content_for :header_tags do %>
25 <%= stylesheet_link_tag "scm" %>
22 <%= stylesheet_link_tag "scm" %>
26 <% end %>
23 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now