use github username when full name is blank - closes ryanb#36

acapilleri · Aug 18, 2011 · 4dee54c · 4dee54c
1 parent 24bcaec
commit 4dee54c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -32,7 +32,7 @@ def generate_token(column)
   end
 
   def display_name
-    name || github_username
+    name.present? ? name : github_username
   end
 
   def banned?

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -1,4 +1,4 @@
-<% title "#{@user.name}'s Profile" %>
+<% title "#{@user.display_name}'s Profile" %>
 
 <div class="content">
   <% if @user == current_user %>

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -30,4 +30,8 @@
     user.reload.unsubscribe_token.should eq(token)
     user.generated_unsubscribe_token.should eq(token)
   end
+
+  it "uses github name as display name when original is blank" do
+    Factory(:user, :name => "", :github_username => "hank").display_name.should eq("hank")
+  end
 end