From 449bdf2225d20c293b4944214b79fdbbb0e2de65 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 20 Apr 2016 16:40:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=89=88=E6=9C=AC=E5=BA=93?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/_dir_list_content.html.erb   | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index b04e40905..79ed44b99 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -1,9 +1,10 @@
 <% @entries.each do |entry| %>
     <% tr_id = Digest::MD5.hexdigest(entry.path)
        depth = params[:depth].to_i %>
-    <%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
-    <%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
-    <% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_name) %>
+    <% sub_path = entry.path[0] == "/" ? entry.path.sub("/", "") : entry.path %>
+    <% ent_path = Redmine::CodesetUtil.replace_invalid_utf8(sub_path)   %>
+    <% ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
+    <% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_path) %>
 
     <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
       <td style="padding-left: <%=18 * depth%>px;" class="filename_no_report hidden">
@@ -15,35 +16,36 @@
                        :repository_id => @repository.identifier_param,
                        :path   => to_path_param(ent_path),
                        :rev    => @rev,
+                       :latest_changes => latest_changes,
                        :depth  => (depth + 1),
                        :parent_id => tr_id)) %>');">&nbsp;</span>
         <% end %>
-        <a class="<%= (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}") %>">
-          <%= h(ent_name) %>
-        </a>
+        <!--<a class="<%#= (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}") %>">-->
+          <!--<%#= h(ent_name) %>-->
+        <!--</a>-->
         <%#= h(ent_name), :class => "(entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
-<%#=  link_to h(ent_name),
+<%=  link_to h(ent_name),
           {:action => (entry.is_dir? ? 'show' : 'entry'), :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>-->
       <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <%# if @repository.report_last_commit %>
-      <td class="tree-comments c_grey hidden">
-        <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
-          <%= (latest_changes.message) if latest_changes && latest_changes.message %>
-        </div>
-      </td>
-      <td class="tree-author c_grey">
-        <div class="hidden" title="<%= (latest_changes.author) if latest_changes && latest_changes.author %>">
-          <%= (latest_changes.author) if latest_changes && latest_changes.author %>
-        </div>
-      </td>
-      <td class="tree-age c_grey">
-        <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %>"><%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %></div>
-      </td>
-
-
+      <div id="children_tree">
+        <td class="tree-comments c_grey hidden">
+          <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
+            <%= (latest_changes.message) if latest_changes && latest_changes.message %>
+          </div>
+        </td>
+        <td class="tree-author c_grey">
+          <div class="hidden" title="<%= (latest_changes.author) if latest_changes && latest_changes.author %>">
+            <%= (latest_changes.author) if latest_changes && latest_changes.author %>
+          </div>
+        </td>
+        <td class="tree-age c_grey">
+          <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %>"><%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %></div>
+        </td>
+      </div>
 <%# end %>
     </tr>
 <% end %>