Merge CDB-2709 into release/2.13.5

CartoDB · May 13, 2014 · 3fdae9c · 3fdae9c
2 parents e34ff1b + 31c1c37
commit 3fdae9c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
@@ -68,7 +68,7 @@ def public
     return render_404 if viewed_user.nil?
 
     @tags             = viewed_user.tags
-    @name             = viewed_user.name || viewed_user.username
+    @name             = viewed_user.name.present? ? viewed_user.name : viewed_user.username
     @twitter_username = viewed_user.twitter_username 
     @description      = viewed_user.description  
     @website          = viewed_user.website 

diff --git a/app/controllers/admin/visualizations_controller.rb b/app/controllers/admin/visualizations_controller.rb
@@ -37,7 +37,9 @@ def public_table
 
     @vizjson = @visualization.to_vizjson
 
+    @name = @visualization.user.name.present? ? @visualization.user.name : @visualization.user.username.truncate(20)
     @avatar_url             = @visualization.user.gravatar(request.protocol, 64)
+
     @disqus_shortname       = @visualization.user.disqus_shortname.presence || 'cartodb'
     @public_tables_count    = @visualization.user.table_count(::Table::PRIVACY_PUBLIC)
 
@@ -74,7 +76,9 @@ def public_map
     response.headers['X-Cache-Channel'] = "#{@visualization.varnish_key}:vizjson"
     response.headers['Cache-Control']   = "no-cache,max-age=86400,must-revalidate, public"
 
+    @name = @visualization.user.name.present? ? @visualization.user.name : @visualization.user.username.truncate(20)
     @avatar_url             = @visualization.user.gravatar(request.protocol, 64)
+
     @disqus_shortname       = @visualization.user.disqus_shortname.presence || 'cartodb'
     @visualization_count    = @visualization.user.public_visualization_count
     @related_tables         = @visualization.related_tables
@@ -107,6 +111,7 @@ def show_protected_public_map
 
     @protected_map_token = @visualization.get_auth_token()
 
+    @name = @visualization.user.name.present? ? @visualization.user.name : @visualization.user.username.truncate(20)
     @avatar_url = @visualization.user.gravatar(request.protocol, 64)
 
     @disqus_shortname       = @visualization.user.disqus_shortname.presence || 'cartodb'

diff --git a/app/views/admin/pages/_user_info.html.erb b/app/views/admin/pages/_user_info.html.erb
@@ -9,9 +9,9 @@
     </div>
 
     <div class="details">
-      <%= content_tag :h2, @name if @name.present? %>
+      <%= content_tag :h2, @name %>
 
-      <%= link_to "@#{@twitter_username}", "http://twitter.com/#{@twitter_username}", :class => :twitter if @twitter_username %>
+      <%= link_to "@#{@twitter_username}", "http://twitter.com/#{@twitter_username}", :class => :twitter if @twitter_username.present? %>
 
       <%= content_tag :p, @description if @description.present? %>
 

diff --git a/app/views/admin/visualizations/public_map.html.erb b/app/views/admin/visualizations/public_map.html.erb
@@ -90,9 +90,9 @@
             </div>
 
             <div class="user embed-right-col">
-              <a href="/" title="Maps by <%= @visualization.user.name || @visualization.user.username %>" class="content">
+              <a href="/" title="Maps by <%= @name %>" class="content">
                 <div class="user-info">
-                  <h4>by <%= @visualization.user.name || @visualization.user.username.truncate(20) %></h4>
+                  <h4>by <%= @name %></h4>
                   <h5><%= "#{@visualization_count} #{@visualization_count != 1 ? "maps" :"map"} created" %></h5>
                 </div>
                 <img src="<%= @avatar_url %>" class="avatar" />

diff --git a/app/views/admin/visualizations/public_table.html.erb b/app/views/admin/visualizations/public_table.html.erb
@@ -59,9 +59,9 @@
           </div>
 
           <div class="user embed-right-col">
-            <a href="/datasets" title="Datasets by <%= @visualization.user.name || @visualization.user.username %>" class="content">
+            <a href="/datasets" title="Datasets by <%= @name %>" class="content">
               <div class="user-info">
-                <h4>by <%= @visualization.user.name || @visualization.user.username.truncate(20) %></h4>
+                <h4>by <%= @name %></h4>
                 <h5><%= "#{@public_tables_count} #{@public_tables_count != 1 ? "tables" :"table"} created" %></h5>
               </div>
               <img src="<%= @avatar_url %>" class="avatar" />