Mercurial > hg > soundsoftware-site
diff app/views/repositories/_dir_list_content.html.erb @ 1115:433d4f72a19b redmine-2.2
Update to Redmine SVN revision 11137 on 2.2-stable branch
author | Chris Cannam |
---|---|
date | Mon, 07 Jan 2013 12:01:42 +0000 |
parents | cbb26bc654de |
children | bb32da3bea34 dffacf8a6908 |
line wrap: on
line diff
--- a/app/views/repositories/_dir_list_content.html.erb Wed Jun 27 14:54:18 2012 +0100 +++ b/app/views/repositories/_dir_list_content.html.erb Mon Jan 07 12:01:42 2013 +0000 @@ -5,35 +5,27 @@ <% ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name) %> <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>"> <td style="padding-left: <%=18 * depth%>px;" class="<%= - @repository.report_last_commit ? "filename" : "filename_no_report" %>";> + @repository.report_last_commit ? "filename" : "filename_no_report" %>"> <% if entry.is_dir? %> -<span class="expander" onclick="<%= remote_function( - :url => { +<span class="expander" onclick="scmEntryClick('<%= tr_id %>', '<%= escape_javascript(url_for( :action => 'show', :id => @project, + :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev, :depth => (depth + 1), - :parent_id => tr_id - }, - :method => :get, - :update => { :success => tr_id }, - :position => :after, - :success => "scmEntryLoaded('#{tr_id}')", - :condition => "scmEntryClick('#{tr_id}')" - ) %>"> </span> + :parent_id => tr_id)) %>');"> </span> <% end %> <%= link_to h(ent_name), - {:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :path => to_path_param(ent_path), :rev => @rev}, + {:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev}, :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 = @project.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, @project) 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="comments"><%=h truncate(changeset.comments, :length => 50) unless changeset.nil? %></td> +<td class="author"><%= entry.author %></td> +<td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td> <% end %> </tr> <% end %>