summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/member.rb2
-rw-r--r--app/models/user.rb6
2 files changed, 2 insertions, 6 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index 7b512de37..2aa26d42f 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -24,7 +24,7 @@ class Member < ActiveRecord::Base
validates_uniqueness_of :user_id, :scope => :project_id
def name
- self.user.display_name
+ self.user.name
end
def before_destroy
diff --git a/app/models/user.rb b/app/models/user.rb
index 569233d53..a017b4289 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -101,12 +101,8 @@ class User < ActiveRecord::Base
end
# Return user's full name for display
- def display_name
- firstname + " " + lastname
- end
-
def name
- display_name
+ "#{firstname} #{lastname}"
end
def active?