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 352575259c08e3ce19a21c77318b3d3dc4bf99d1..a7b83e817cfcde0a58b07beb0ef3af2c574778af 100644 (file)
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -25,7 +25,7 @@ end %>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
 <td class="revision"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
 <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-<td class="author"><%=h(entry.lastrev.author) if entry.lastrev %></td>
+<td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
 <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
 <td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
 </tr>

diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml
index ea722329f89b78432027b07141a169abc7c13eeb..52992bb89c0f537db11ff4b7e576dafd9b25417c 100644 (file)
--- a/app/views/repositories/_revisions.rhtml
+++ b/app/views/repositories/_revisions.rhtml
@@ -17,7 +17,7 @@
 <td class="checkbox"><%= 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) %></td>
 <td class="checkbox"><%= 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) %></td>
 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
-<td class="author"><%=h changeset.committer %></td>
+<td class="author"><%=h changeset.committer.to_s.split('<').first %></td>
 <td class="comments"><%= textilizable(changeset.comments) %></td>
 </tr>
 <% line_num += 1 %>

diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml
index 3aa8841048fdc2ca2455a2704c6bb22cd29fd60e..28d99a39346f30b9c40bb695c4a7ec611193ea3c 100644 (file)
--- a/app/views/repositories/annotate.rhtml
+++ b/app/views/repositories/annotate.rhtml
@@ -12,7 +12,7 @@
       <th class="line-num"><%= line_num %></th>
       <td class="revision">
       <%= (revision.identifier ? link_to(revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier) : revision.revision) if revision %></td>
-      <td class="author"><%= h(revision.author) if revision %></td>
+      <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
       <td class="line-code"><pre><%= line %></pre></td>
     </tr>
     <% line_num += 1 %>

diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 80cfdf2b71ea13238d52050288707ae167cae332..d60c0b0b75acdbd82eb364906c3a547d43b9fd09 100644 (file)
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -22,7 +22,7 @@
 <h2><%= l(:label_revision) %> <%= @changeset.revision %></h2>
 
 <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
-<em><%= @changeset.committer %>, <%= format_time(@changeset.committed_on) %></em></p>
+<em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p>
 
 <%= textilizable @changeset.comments %>