From: Jean-Philippe Lang Date: Sat, 8 Mar 2008 13:46:07 +0000 (+0000) Subject: Strip out email address from authors in repository screens (#814). X-Git-Tag: 0.7.0-RC1~83 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=07882590bb50c8eba35fa5f70cb987a34f51e4a3;p=redmine.git Strip out email address from authors in repository screens (#814). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1208 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml index 352575259..a7b83e817 100644 --- a/app/views/repositories/_dir_list_content.rhtml +++ b/app/views/repositories/_dir_list_content.rhtml @@ -25,7 +25,7 @@ end %> <%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %> <%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %> <%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %> -<%=h(entry.lastrev.author) if entry.lastrev %> +<%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %> <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %> <%=h truncate(changeset.comments, 50) unless changeset.nil? %> diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml index ea722329f..52992bb89 100644 --- a/app/views/repositories/_revisions.rhtml +++ b/app/views/repositories/_revisions.rhtml @@ -17,7 +17,7 @@ <%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %> <%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %> <%= format_time(changeset.committed_on) %> -<%=h changeset.committer %> +<%=h changeset.committer.to_s.split('<').first %> <%= textilizable(changeset.comments) %> <% line_num += 1 %> diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml index 3aa884104..28d99a393 100644 --- a/app/views/repositories/annotate.rhtml +++ b/app/views/repositories/annotate.rhtml @@ -12,7 +12,7 @@ <%= line_num %> <%= (revision.identifier ? link_to(revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier) : revision.revision) if revision %> - <%= h(revision.author) if revision %> + <%= h(revision.author.to_s.split('<').first) if revision %>
<%= line %>
<% line_num += 1 %> diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml index 80cfdf2b7..d60c0b0b7 100644 --- a/app/views/repositories/revision.rhtml +++ b/app/views/repositories/revision.rhtml @@ -22,7 +22,7 @@

<%= l(:label_revision) %> <%= @changeset.revision %>

<% if @changeset.scmid %>ID: <%= @changeset.scmid %>
<% end %> -<%= @changeset.committer %>, <%= format_time(@changeset.committed_on) %>

+<%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %>

<%= textilizable @changeset.comments %>