jro_apps/redmine Commit - r575:65be9d3c86f5

0

app/helpers/application_helper.rb +1 -1

               # Display a link to user's account page
               def link_to_user(user)
-                link_to user.display_name, :controller => 'account', :action => 'show', :id => user
+                link_to user.name, :controller => 'account', :action => 'show', :id => user
               end
               def link_to_issue(issue)

0

app/models/member.rb +1 -1

               validates_uniqueness_of :user_id, :scope => :project_id
               def name
-                self.user.display_name
+                self.user.name
               end
               def before_destroy

0

app/models/user.rb +1 -5

               end
               # Return user's full name for display
-              def display_name
-                firstname + " " + lastname
-              end
               def name
-                display_name
+                "#{firstname} #{lastname}"
               end
               def active?

0

app/views/account/show.rhtml +1 -1

-            <h2><%= @user.display_name %></h2>
+            <h2><%=h @user.name %></h2>
             <p>
             <%= mail_to @user.mail unless @user.pref.hide_mail %>

0

app/views/attachments/_links.rhtml +1 -1

               <p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'download', :id => attachment }, :class => 'icon icon-attachment' %>
               (<%= number_to_human_size attachment.filesize %>)
               <% unless options[:no_author] %>
-                <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em>
+                <em><%= attachment.author.name %>, <%= format_date(attachment.created_on) %></em>
               <% end %>
               <% if options[:delete_url] %>
                 <%= link_to image_tag('delete.png'), options[:delete_url].update({:attachment_id => attachment}), :confirm => l(:text_are_you_sure), :method => :post %>

0

app/views/documents/show.rhtml +1 -1

                     </div>
                     <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
                     (<%= number_to_human_size attachment.filesize %>)<br />
-                    <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em><br />
+                    <em><%= attachment.author.name %>, <%= format_date(attachment.created_on) %></em><br />
                     <%= lwr(:label_download, attachment.downloads) %>
                 </li>
             <% end %>

0

app/views/mailer/_issue.rhtml +1 -1

             <%=l(:label_issue)%> #<%= issue.id %> - <%= issue.subject %>
-            <%=l(:field_author)%>: <%= issue.author.display_name %>
+            <%=l(:field_author)%>: <%= issue.author.name %>
             <%=l(:field_assigned_to)%>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %>
             <%=l(:field_status)%>: <%= issue.status.name %>

0

app/views/news/show.rhtml +1 -1

             <h2><%=h @news.title %></h2>
             <p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>
-            <%= @news.author.display_name %>, <%= format_time(@news.created_on) %></em></p>
+            <%= @news.author.name %>, <%= format_time(@news.created_on) %></em></p>
             <br />
             <%= textilizable(@news.description) %>
             <br />

0

app/views/projects/_members.rhtml +1 -1

             	<% @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position}.each do |member| %>
             	<% next if member.new_record? %>
             	<tr class="<%= cycle 'odd', 'even' %>">
-            	<td><%= member.user.display_name %></td>
+            	<td><%= member.name %></td>
                 <td align="center">
                 <% if authorize_for('members', 'edit') %>
                   <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member}, :method => :post) do |f| %>

0

app/views/projects/list_members.rhtml +1 -1

             <h3><%= role.name %></h3>
             <ul>
             <% members[role].each do |m| %>
-            <li><%= link_to m.user.display_name, :controller => 'account', :action => 'show', :id => m.user %> (<%= format_date m.created_on %>)</li>
+            <li><%= link_to m.name, :controller => 'account', :action => 'show', :id => m.user %> (<%= format_date m.created_on %>)</li>
             <% end %>
             </ul>
             <% end %>

	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