diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-05-13 03:55:21 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-05-13 03:55:21 +0000 |
| commit | d65c3d438d28638f3d0af87e5aa2a0519b385f3c (patch) | |
| tree | 498d792ac19dc79b654f54634bc5c176bcb06560 /app/views | |
| parent | 625b7d905181a3b04fb490ab21061742f7c3957f (diff) | |
| download | redmine-d65c3d438d28638f3d0af87e5aa2a0519b385f3c.tar.gz redmine-d65c3d438d28638f3d0af87e5aa2a0519b385f3c.zip | |
scm: git: show only filename and filesize if setting of reporting last commit is disable (#8365, #7047).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5775 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/repositories/_dir_list.rhtml | 10 | ||||
| -rw-r--r-- | app/views/repositories/_dir_list_content.rhtml | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/views/repositories/_dir_list.rhtml b/app/views/repositories/_dir_list.rhtml index 5590652f5..84efcfc27 100644 --- a/app/views/repositories/_dir_list.rhtml +++ b/app/views/repositories/_dir_list.rhtml @@ -3,10 +3,12 @@ <tr id="root"> <th><%= l(:field_name) %></th> <th><%= l(:field_filesize) %></th> -<th><%= l(:label_revision) %></th> -<th><%= l(:label_age) %></th> -<th><%= l(:field_author) %></th> -<th><%= l(:field_comments) %></th> +<% if @repository.report_last_commit %> +<th><%= l(:label_revision) %></th> +<th><%= l(:label_age) %></th> +<th><%= l(:field_author) %></th> +<th><%= l(:field_comments) %></th> +<% end %> </tr> </thead> <tbody> diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml index a4e08b046..be7e48a34 100644 --- a/app/views/repositories/_dir_list_content.rhtml +++ b/app/views/repositories/_dir_list_content.rhtml @@ -4,7 +4,8 @@ <% ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path) %> <% 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="filename"> +<td style="padding-left: <%=18 * depth%>px;" class="<%= + @repository.report_last_commit ? "filename" : "filename_no_report" %>";> <% if entry.is_dir? %> <span class="expander" onclick="<%= remote_function :url => {:action => 'show', :id => @project, :path => to_path_param(ent_path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id}, :method => :get, @@ -19,9 +20,11 @@ </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="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)) : changeset.author if entry.lastrev %></td> <td class="comments"><%=h truncate(changeset.comments, :length => 50) unless changeset.nil? %></td> +<% end %> </tr> <% end %> |