jro_apps/redmine Commit - r9622:7c105ec9e93b

Adds a method to load changesets for repository entries....

Jean-Philippe Lang -

r9622:7c105ec9e93b

parent child

Context file:

r9622:7c105ec9e93b

app/models/repository.rb +13 -1

               end
               def entries(path=nil, identifier=nil)
-                scm.entries(path, identifier)
+                entries = scm.entries(path, identifier)
+                load_entries_changesets(entries)
+                entries
               end
               def branches
                 end
               end
+              def load_entries_changesets(entries)
+                if entries
+                  entries.each do |entry|
+                    if entry.lastrev && entry.lastrev.identifier
+                      entry.changeset = find_changeset_by_name(entry.lastrev.identifier)
+                    end
+                  end
+                end
+              end
               private
               # Deletes repository data

app/models/repository/bazaar.rb +2 0

                     end
                   end
                 end
+                load_entries_changesets(entries)
+                entries
               end
               def fetch_changesets

app/models/repository/cvs.rb +1 0

                     end
                   end
                 end
+                load_entries_changesets(entries)
                 entries
               end

app/models/repository/darcs.rb +1 0

                     end
                   end
                 end
+                load_entries_changesets(entries)
                 entries
               end

app/models/repository/filesystem.rb 0 -4

                 false
               end
-              def entries(path=nil, identifier=nil)
-                scm.entries(path, identifier)
-              end
               def fetch_changesets
                 nil
               end

app/models/repository/git.rb +3 -3

               end
               def entries(path=nil, identifier=nil)
-                scm.entries(path,
+                entries = scm.entries(path, identifier, :report_last_commit => extra_report_last_commit)
-                            identifier,
+                load_entries_changesets(entries)
-                            options = {:report_last_commit => extra_report_last_commit})
+                entries
               end
               # With SCMs that have a sequential commit numbering,

app/views/repositories/_dir_list_content.html.erb +3 -4

                       :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
             </td>
             <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
-            <% changeset = @repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
             <% if @repository.report_last_commit %>
-            <td class="revision"><%= link_to_revision(changeset, @repository) if changeset %></td>
+            <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
             <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-            <td class="author"><%= changeset.nil? ? h(Redmine::CodesetUtil.replace_invalid_utf8(entry.lastrev.author.to_s.split('<').first)) : h(changeset.author) if entry.lastrev %></td>
+            <td class="author"><%= entry.changeset.nil? ? h(Redmine::CodesetUtil.replace_invalid_utf8(entry.lastrev.author.to_s.split('<').first)) : h(entry.changeset.author) if entry.lastrev %></td>
-            <td class="comments"><%=h truncate(changeset.comments, :length => 50) unless changeset.nil? %></td>
+            <td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
             <% end %>
             </tr>
             <% end %>

lib/redmine/scm/adapters/abstract_adapter.rb +2 -1

                   end
                   class Entry
-                    attr_accessor :name, :path, :kind, :size, :lastrev
+                    attr_accessor :name, :path, :kind, :size, :lastrev, :changeset
                     def initialize(attributes={})
                       self.name = attributes[:name] if attributes[:name]
                       self.path = attributes[:path] if attributes[:path]

General Comments 0

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

No TODOs yet

	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