jro_apps/redmine Commit - r575:65be9d3c86f5

Removed User#display_name (replaced by User#name)....

Jean-Philippe Lang -

r575:65be9d3c86f5

parent child

Context file:

r575:65be9d3c86f5

Collapse all files

app/helpers/application_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class RedCloth
               # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
               # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
               def hard_break( text )
                 text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
               end
             end
             module ApplicationHelper
               # Return current logged in user or nil
               def loggedin?
                 @logged_in_user
               end
               # Return true if user is logged in and is admin, otherwise false
               def admin_loggedin?
                 @logged_in_user and @logged_in_user.admin?
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project)  )  )
                   return true
                 end
                 return false
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
               end
               # 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)
                 link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def format_date(date)
                 l_date(date) if date
               end
               def format_time(time)
                 l_datetime((time.is_a? String) ? time.to_time : time) if time
               end
               def day_name(day)
                 l(:general_day_names).split(',')[day-1]
               end
               def month_name(month)
                 l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 page_param = options.delete(:page_param) || :page
                 html = ''
                 html << link_to_remote(('&#171; ' + l(:label_previous)),
                                         {:update => "content", :url => options.merge(page_param => paginator.current.previous)},
                                         {:href => url_for(:params => options.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote(n.to_s,
                                   {:url => {:params => options.merge(page_param => n)}, :update => 'content'},
                                   {:href => url_for(:params => options.merge(page_param => n))})
                 end || '')
                 html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
                                              {:update => "content", :url => options.merge(page_param => paginator.current.next)},
                                              {:href => url_for(:params => options.merge(page_param => paginator.current.next))}) if paginator.current.next
                 html
               end
               # textilize text according to system settings and RedCloth availability
               def textilizable(text, options = {})
                 return "" if text.blank?
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|title| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|title| "##{title}" }
                 else
                   if @project
                     format_wiki_link = Proc.new {|title| url_for :controller => 'wiki', :action => 'index', :id => @project, :page => title }
                   else
                     format_wiki_link = Proc.new {|title| title }
                   end
                 end
                 # turn wiki links into textile links:
                 # example:
                 #   [[link]] -> "link":link
                 #   [[link|title]] -> "title":link
                 text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) {|m| "\"#{$3 || $1}\":" + format_wiki_link.call(Wiki.titleize($1)) }
                 # turn issue ids into links
                 # example:
                 #   #52 -> <a href="/issues/show/52">#52</a>
                 text = text.gsub(/#(\d+)(?=\b)/) {|m| link_to "##{$1}", :controller => 'issues', :action => 'show', :id => $1}
                 # turn revision ids into links (@project needed)
                 # example:
                 #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (@project.id is 6)
                 text = text.gsub(/(?=\b)r(\d+)(?=\b)/) {|m| link_to "r#{$1}", :controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1} if @project
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments]
                 if attachments
                   text = text.gsub(/!([<>=]*)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
                     align = $1
                     filename = $2
                     rf = Regexp.new(filename,  Regexp::IGNORECASE)
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename =~ rf }
                       image_url = url_for :controller => 'attachments', :action => 'show', :id => found.id
                       "!#{align}#{image_url}!"
                     else
                       "!#{align}#{filename}!"
                     end
                   end
                 end
                 # finally textilize text
                 @do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
                 text = @do_textilize ? auto_link(RedCloth.new(text, [:hard_breaks]).to_html) : simple_format(auto_link(h(text)))
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     msg = msg.first if msg.is_a? Array
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         msg = msg.first if msg.is_a? Array
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.first <=> y.first }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html].store :class, "tabular"
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def calendar_for(field_id)
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def wikitoolbar_for(field_id)
                 return '' unless Setting.text_formatting == 'textile'
                 javascript_include_tag('jstoolbar') + javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();")
               end
             end
             class TabularFormBuilder < ActionView::Helpers::FormBuilder
               include GLoc
               def initialize(object_name, object, template, options, proc)
                 set_language_if_valid options.delete(:lang)
                 @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
               end
               (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   return super if options.delete :no_label
                   label_text = l(options[:label]) if options[:label]
                   label_text ||= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym)
                   label_text << @template.content_tag("span", " *", :class => "required") if options.delete(:required)
                   label = @template.content_tag("label", label_text,
                                 :class => (@object && @object.errors[field] ? "error" : nil),
                                 :for => (@object_name.to_s + "_" + field.to_s))
                   label + super
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def select(field, choices, options = {}, html_options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 label = @template.content_tag("label", label_text,
                               :class => (@object && @object.errors[field] ? "error" : nil),
                               :for => (@object_name.to_s + "_" + field.to_s))
                 label + super
               end
             end

app/models/member.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Member < ActiveRecord::Base
               belongs_to :user
               belongs_to :role
               belongs_to :project
               validates_presence_of :role, :user, :project
               validates_uniqueness_of :user_id, :scope => :project_id
               def name
-                self.user.display_name
+                self.user.name
               end
               def before_destroy
                 # remove category based auto assignments for this member
                 project.issue_categories.update_all "assigned_to_id = NULL", ["assigned_to_id = ?", self.user.id]
               end
             end

app/models/user.rb +1 -5

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "digest/sha1"
             class User < ActiveRecord::Base
               # Account statuses
               STATUS_ACTIVE     = 1
               STATUS_REGISTERED = 2
               STATUS_LOCKED     = 3
               has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name", :dependent => :delete_all
               has_many :projects, :through => :memberships
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
               has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
               has_one :rss_key, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'"
               belongs_to :auth_source
               attr_accessor :password, :password_confirmation
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
               attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               validates_presence_of :login, :firstname, :lastname, :mail
               validates_uniqueness_of :login, :mail
               # Login must contain lettres, numbers, underscores only
               validates_format_of :login, :with => /^[a-z0-9_\-@\.]+$/i
               validates_length_of :login, :maximum => 30
               validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
               validates_length_of :firstname, :lastname, :maximum => 30
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
               validates_length_of :mail, :maximum => 60
               # Password length between 4 and 12
               validates_length_of :password, :in => 4..12, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               validates_associated :custom_values, :on => :update
               def before_save
                 # update hashed_password if password was set
                 self.hashed_password = User.hash_password(self.password) if self.password
               end
               def self.active
                 with_scope :find => { :conditions => [ "status = ?", STATUS_ACTIVE ] } do
                   yield
                 end
               end
               def self.find_active(*args)
                 active do
                   find(*args)
                 end
               end
               # Returns the user that matches provided login and password, or nil
               def self.try_to_login(login, password)
                 user = find(:first, :conditions => ["login=?", login])
                 if user
                   # user is already in local database
                   return nil if !user.active?
                   if user.auth_source
                     # user has an external authentication method
                     return nil unless user.auth_source.authenticate(login, password)
                   else
                     # authentication with local password
                     return nil unless User.hash_password(password) == user.hashed_password
                   end
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                   if attrs
                     onthefly = new(*attrs)
                     onthefly.login = login
                     onthefly.language = Setting.default_language
                     if onthefly.save
                       user = find(:first, :conditions => ["login=?", login])
                       logger.info("User '#{user.login}' created on the fly.") if logger
                     end
                   end
                 end
                 user.update_attribute(:last_login_on, Time.now) if user
                 user
                 rescue => text
                   raise text
               end
               # Return user's full name for display
-              def display_name
-                firstname + " " + lastname
-              end
               def name
-                display_name
+                "#{firstname} #{lastname}"
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def registered?
                 self.status == STATUS_REGISTERED
               end
               def locked?
                 self.status == STATUS_LOCKED
               end
               def check_password?(clear_password)
                 User.hash_password(clear_password) == self.hashed_password
               end
               def role_for_project(project)
                 return nil unless project
                 member = memberships.detect {|m| m.project_id == project.id}
                 member ? member.role : nil
               end
               def authorized_to(project, action)
                 return true if self.admin?
                 role = role_for_project(project)
                 role && Permission.allowed_to_role(action, role)
               end
               def pref
                 self.preference ||= UserPreference.new(:user => self)
               end
               def get_or_create_rss_key
                 self.rss_key || Token.create(:user => self, :action => 'feeds')
               end
               def self.find_by_rss_key(key)
                 token = Token.find_by_value(key)
                 token && token.user.active? ? token.user : nil
               end
               def self.find_by_autologin_key(key)
                 token = Token.find_by_action_and_value('autologin', key)
                 token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
               end
               def <=>(user)
                 lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname
               end
             private
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")
               end
             end

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 %>
             <ul>
                 <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
             <% for custom_value in @custom_values %>
             <% if !custom_value.value.empty? %>
                 <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
             <% end %>
             <% end %>
             </ul>
             </p>
             <% unless @memberships.empty? %>
             <h3><%=l(:label_project_plural)%></h3>
             <ul>
             <% for membership in @memberships %>
             	<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %>
                 (<%= membership.role.name %>, <%= format_date(membership.created_on) %>)</li>
             <% end %>
             </ul>
             <% end %>
             <h3><%=l(:label_activity)%></h3>
             <p>
             <%=l(:label_reported_issues)%>: <%= Issue.count(["author_id=?", @user.id]) %>
             </p>

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

             <div class="attachments">
             <% for attachment in attachments %>
               <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 %>
               <% end %>
               </p>
             <% end %>
             </div>

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

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>
             <h2><%= @document.title %></h2>
             <p><em><%= @document.category.name %><br />
             <%= format_date @document.created_on %></em></p>
             <%= textilizable @document.description, :attachments => @document.attachments %>
             <br />
             <h3><%= l(:label_attachment_plural) %></h3>
             <ul class="documents">
             <% for attachment in @attachments %>
                 <li>
                     <div class="contextual">
                     <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
                     </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 %>
             </ul>
             <br />
             <% if authorize_for('documents', 'add_attachment') %>
             <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
               <% form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
                 <%= render :partial => 'attachments/form' %>
               <%= submit_tag l(:button_add) %>
               <% end %>
             <% end %>

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 %>
             <%= issue.description %>
             http://<%= Setting.host_name %>/issues/show/<%= issue.id %>

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

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'icon icon-edit' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>
             <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 />
             <div id="comments" style="margin-bottom:16px;">
             <h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>
             <% @news.comments.each do |comment| %>
                 <% next if comment.new_record? %>
                 <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
                 <div class="contextual">
                     <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
                 </div>
                 <%= simple_format(auto_link(h comment.comments))%>
             <% end if @news.comments_count > 0 %>
             </div>
             <% if authorize_for 'news', 'add_comment' %>
             <p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
             <% form_tag({:action => 'add_comment', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
             <%= text_area 'comment', 'comments', :cols => 60, :rows => 6 %>
             <p><%= submit_tag l(:button_add) %></p>
             <% end %>
             <% end %>

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

             <%= error_messages_for 'member' %>
             <% roles = Role.find(:all, :order => 'position') %>
             <% users = User.find_active(:all) - @project.users %>
             <table class="list">
             	<thead>
             	  <th><%= l(:label_user) %></th>
             	  <th><%= l(:label_role) %></th>
             	  <th style="width:15%"></th>
             	</thead>
             	<tbody>
             	<% @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| %>
                     <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, {}, :class => "small" %>
                     <%= submit_tag l(:button_change), :class => "small" %>
                   <% end %>
                 <% end %>
                 </td>
                 <td align="center">
                   <small><%= link_to_remote l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
                                                           :method => :post
                                                         }, :title => l(:button_delete),
                                                            :class => 'icon icon-del' %></small>
                 </td>
             	</tr>
             	</tbody>
             <% end; reset_cycle %>
             </table>
             &nbsp;
             <% if authorize_for('projects', 'add_member') && !users.empty? %>
               <% remote_form_for(:member, @member, :url => {:controller => 'projects', :action => 'add_member', :tab => 'members', :id => @project}, :method => :post) do |f| %>
                 <p><label for="member_user_id"><%=l(:label_member_new)%></label><br />
                 <%= f.select :user_id, users.collect{|user| [user.name, user.id]} %>
                 <%= l(:label_role) %>: <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, :selected => nil %>
                 <%= submit_tag l(:button_add) %></p>
               <% end %>
             <% end %>

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

             <h2><%=l(:label_member_plural)%></h2>
             <% if @members.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <% members = @members.group_by {|m| m.role } %>
             <% members.keys.sort{|x,y| x.position <=> y.position}.each do |role| %>
             <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 %>

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