[WIP] remove thumbnail_url

seuros · seuros · commit 4ea6ba2e23d0 · 2014-07-27T16:05:56.000Z
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -146,7 +146,7 @@ def autocomplete
             name:      user.display_name,
             twitter:   user.twitter,
             github:    user.github,
-            thumbnail: user.thumbnail_url
+            thumbnail: user.avatar.url
           } },
           data:        @users.collect(&:username)
         }.to_json
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
@@ -10,7 +10,6 @@ def show_private_message?
   end
 
   def avatar_image_tag(user, options = {})
-    return nil if user.thumbnail_url.blank?
     options['data-user'] = user.username
     link_to(
         users_image_tag(user),
@@ -31,7 +30,7 @@ def users_image_tag(user, options = {})
 
   #TODO Remove
   def users_image_path(user)
-    user.avatar_url
+    user.avatar.url
   end
 
   def user_or_team_image_path(user_or_team)
diff --git a/app/jobs/generate_top_users_composite_job.rb b/app/jobs/generate_top_users_composite_job.rb
@@ -13,7 +13,7 @@ def perform
   private
 
   def cache_users
-    users = User.top(108).map { |u| {u.username => u.thumbnail_url} }.to_json
+    users = User.top(108).map { |u| {u.username => u.avatar.url} }.to_json
     Redis.current.set 'top_users', users
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -416,7 +416,7 @@ def public_hash(full=false)
       hash[:title]              = title
       hash[:company]            = company
       hash[:specialities]       = speciality_tags
-      hash[:thumbnail]          = thumbnail_url
+      hash[:thumbnail]          = avatar.url
       hash[:accomplishments]    = highlights.collect(&:description)
       hash[:accounts][:twitter] = twitter
     end
diff --git a/app/views/highlights/_random.html.haml b/app/views/highlights/_random.html.haml
@@ -3,5 +3,5 @@
     .featuredAccomplishment{:class => hide_all_but_first}
       ="\"#{highlight.description}\""
       .author
-        =link_to(image_tag(highlight.user.thumbnail_url), badge_path(:username => highlight.user.username))
+        =link_to(image_tag(highlight.user.avatar.url), badge_path(:username => highlight.user.username))
         %span=link_to(highlight.user.display_name, badge_path(:username => highlight.user.username))
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
@@ -39,13 +39,10 @@
 
             %p.special-p Avatar:
             .special-setting
-              - if @user.avatar.blank?
-                = image_tag(@user.thumbnail_url, class: 'avatar')
-              - else
-                = image_tag(@user.avatar_url, class: 'avatar')
-                .div
-                  = form.check_box :remove_avatar
-                  = form.label :remove_avatar, "Remove Avatar", class: 'checkbox-label'
+              = image_tag(@user.avatar_url, class: 'avatar')
+              .div
+                = form.check_box :remove_avatar
+                = form.label :remove_avatar, "Remove Avatar", class: 'checkbox-label'
               .div
                 = form.file_field :avatar
                 = form.hidden_field :avatar_cache
