jro_apps/redmine Commit - r1194:07882590bb50

Strip out email address from authors in repository screens (#814)....

Jean-Philippe Lang -

r1194:07882590bb50

parent child

Context file:

r1194:07882590bb50

Collapse all files

app/views/repositories/_dir_list_content.rhtml +1 -1

             <% @entries.each do |entry| %>
             <% tr_id = Digest::MD5.hexdigest(entry.path)
                depth = params[:depth].to_i %>
             <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry">
             <td class="filename">
             <%= if entry.is_dir?
               link_to_remote h(entry.name),
                              {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                               :update => { :success => tr_id },
                               :position => :after,
                               :success => "scmEntryLoaded('#{tr_id}')",
                               :condition => "scmEntryClick('#{tr_id}')"
                              },
                              {:href => url_for({:action => 'browse', :id => @project, :path => entry.path, :rev => @rev}),
                               :class => ('icon icon-folder'),
                               :style => "margin-left: #{18 * depth}px;"
                              }
             else
               link_to h(entry.name),
                       {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => entry.path, :rev => @rev},
                       :class => 'icon icon-file',
                       :style => "margin-left: #{18 * depth}px;"
             end %>
             </td>
             <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>
             <% end %>

app/views/repositories/_revisions.rhtml +1 -1

             <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %>
             <table class="list changesets">
             <thead><tr>
             <th>#</th>
             <th></th>
             <th></th>
             <th><%= l(:label_date) %></th>
             <th><%= l(:field_author) %></th>
             <th><%= l(:field_comments) %></th>
             </tr></thead>
             <tbody>
             <% show_diff = entry && entry.is_file? && revisions.size > 1 %>
             <% line_num = 1 %>
             <% revisions.each do |changeset| %>
             <tr class="changeset <%= cycle 'odd', 'even' %>">
             <td class="id"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></td>
             <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 %>
             <% end %>
             </tbody>
             </table>
             <%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
             <% end %>

app/views/repositories/annotate.rhtml +1 -1

             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
             <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
             <div class="autoscroll">
             <table class="filecontent annotate CodeRay">
               <tbody>
                 <% line_num = 1 %>
                 <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
                 <% revision = @annotate.revisions[line_num-1] %>
                 <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
                   <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 %>
                 <% end %>
               </tbody>
             </table>
             </div>
             <% html_title(l(:button_annotate)) -%>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/repositories/revision.rhtml +1 -1

             <div class="contextual">
               &#171;
               <% unless @changeset.previous.nil? -%>
                 <%= link_to l(:label_previous), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.previous.revision %>
               <% else -%>
                 <%= l(:label_previous) %>
               <% end -%>
             |
               <% unless @changeset.next.nil? -%>
                 <%= link_to l(:label_next), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.next.revision %>
               <% else -%>
                 <%= l(:label_next) %>
               <% end -%>
               &#187;&nbsp;
               <% form_tag do %>
                 <%= text_field_tag 'rev', @rev, :size => 5 %>
                 <%= submit_tag 'OK' %>
               <% end %>
             </div>
             <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 %>
             <% if @changeset.issues.any? %>
             <h3><%= l(:label_related_issues) %></h3>
             <ul>
             <% @changeset.issues.each do |issue| %>
               <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
             <% end %>
             </ul>
             <% end %>
             <h3><%= l(:label_attachment_plural) %></h3>
             <div style="float:right;">
             <div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %>&nbsp;</div>
             <div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %>&nbsp;</div>
             <div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %>&nbsp;</div>
             </div>
             <p><%= link_to(l(:label_view_diff), :action => 'diff', :id => @project, :path => "", :rev => @changeset.revision) if @changeset.changes.any? %></p>
             <table class="list">
             <tbody>
             <% @changes.each do |change| %>
             <tr class="<%= cycle 'odd', 'even' %>">
             <td><div class="square action_<%= change.action %>"></div> <%= change.path %> <%= "(#{change.revision})" unless change.revision.blank?  %></td>
             <td align="right">
             <% if change.action == "M" %>
             <%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => change.path, :rev => @changeset.revision %>
             <% end %>
             </td>
             </tr>
             <% end %>
             </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @changes_pages %></p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>
             <% html_title("#{l(:label_revision)} #{@changeset.revision}") -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages