jro_apps/redmine Commit - r2744:5b975706932d

SCM:...

Jean-Philippe Lang -

r2744:5b975706932d

parent child

Context file:

r2744:5b975706932d

Collapse all files

app/controllers/repositories_controller.rb +1 -3

                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
                   show_error_not_found and return unless @entries
-                  if @path.blank?
+                  @changesets = @repository.latest_changesets(@path, @rev)
-                    @changesets = @repository.latest_changesets(@path, @rev)
-                  end
                   @properties = @repository.properties(@path, @rev)
                   render :action => 'show'
                 end

app/views/repositories/_link_to_functions.rhtml +4 0

+            <% if @entry && @entry.kind == 'file' %>
             <p>
             <%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
             <% if @repository.supports_cat? %>
             <%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
             <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
             </p>
+            <% end %>

app/views/repositories/_revisions.rhtml +1 -1

             <th><%= l(:field_comments) %></th>
             </tr></thead>
             <tbody>
-            <% show_diff = entry && entry.is_file? && revisions.size > 1 %>
+            <% show_diff = revisions.size > 1 %>
             <% line_num = 1 %>
             <% revisions.each do |changeset| %>
             <tr class="changeset <%= cycle 'odd', 'even' %>">

app/views/repositories/diff.rhtml +1 -1

-            <h2><%= l(:label_revision) %> <%= format_revision(@rev) %> <%= @path.gsub(/^.*\//, '') %></h2>
+            <h2><%= l(:label_revision) %> <%= format_revision(@rev_to) + ':' if @rev_to %><%= format_revision(@rev) %> <%=h @path %></h2>
             <!-- Choose view type -->
             <% form_tag({}, :method => 'get') do %>

app/views/repositories/show.rhtml +8 -2

             <% if @changesets && !@changesets.empty? && authorize_for('repositories', 'revisions') %>
             <h3><%= l(:label_latest_revision_plural) %></h3>
-            <%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
+            <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => nil }%>
-            <p><%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project %></p>
+            <% if @path.blank? %>
+            	<p><%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project %></p>
+            <% else %>
+            	<p><%= link_to l(:label_view_revisions), :action => 'changes', :path => to_path_param(@path), :id => @project %></p>
+            <% end %>
             <% content_for :header_tags do %>
               <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :action => 'revisions', :id => @project, :page => nil, :key => User.current.rss_key})) %>
             <% end %>

config/locales/fr.yml +1 -1

               enumeration_activities: Activités (suivi du temps)
               label_greater_or_equal: ">="
               label_less_or_equal: "<="
-              label_view_all_revisions: View all revisions
+              label_view_all_revisions: Voir toutes les révisions
               label_tag: Tag
               label_branch: Branch
               error_no_tracker_in_project: No tracker is associated to this project. Please check the Project settings.

test/functional/repositories_subversion_controller_test.rb +23 -2

                   assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
                 end
-                def test_changes
+                def test_file_changes
                   get :changes, :id => 1, :path => ['subversion_test', 'folder', 'helloworld.rb' ]
                   assert_response :success
                   assert_template 'changes'
                                            :child => { :tag => 'span', :content => 'native' } }
                   end
                 end
+                def test_directory_changes
+                  get :changes, :id => 1, :path => ['subversion_test', 'folder' ]
+                  assert_response :success
+                  assert_template 'changes'
+                  changesets = assigns(:changesets)
+                  assert_not_nil changesets
+                  assert_equal %w(7 6 5 2), changesets.collect(&:revision)
+                end
                 def test_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
                                         }
                 end
-                def test_diff
+                def test_revision_diff
                   get :diff, :id => 1, :rev => 3
                   assert_response :success
                   assert_template 'diff'
                 end
+                def test_directory_diff
+                  get :diff, :id => 1, :rev => 6, :rev_to => 2, :path => ['subversion_test', 'folder']
+                  assert_response :success
+                  assert_template 'diff'
+                  diff = assigns(:diff)
+                  assert_not_nil diff
+                  # 2 files modified
+                  assert_equal 2, Redmine::UnifiedDiff.new(diff).size
+                end
                 def test_annotate
                   get :annotate, :id => 1, :path => ['subversion_test', 'helloworld.c']

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages