Fallback to email for current user in upper-right-hand corner if firs…

…t name is null
kandanapp · Apr 11, 2012 · f6661b1 · f6661b1
1 parent 52efcc5
commit f6661b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/assets/javascripts/backbone/kandan.js.coffee b/app/assets/javascripts/backbone/kandan.js.coffee
@@ -101,9 +101,11 @@ window.Kandan =
       <img src="http://gravatar.com/avatar/<%= gravatar_hash %>?s=25&d=http://bushi.do/images/profile.png"/><span><%= name %></span>
     '''
     currentUser = Kandan.Helpers.Users.currentUser()
+    displayName =   "#{currentUser.first_name} #{currentUser.last_name}" if currentUser.first_name?
+    displayName ||= currentUser.email
     $(".header .user").html template({
       gravatar_hash: currentUser.gravatar_hash,
-      name: "#{currentUser.first_name} #{currentUser.last_name}"
+      name: displayName
     })
 
   init: ->

diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
@@ -17,7 +17,7 @@
 
     <div class="search">
       <form method="get" action="/search" target="_blank">
-	<input type="text" class="query" name="query"/>
+	      <input type="text" class="query" name="query"/>
       </form>
     </div>
   </div>