Merge pull request hotsh#410 from LindseyB/master

Default avatar fix
nashby · Oct 16, 2011 · 67a3fe6 · 67a3fe6
2 parents 971932e + 1ffe961
commit 67a3fe6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/views/updates/_detail.haml b/app/views/updates/_detail.haml
@@ -3,7 +3,10 @@
   .byline
     %a.author{:href => "/users/#{update.author.username}"}
       .avatar
-        %img{:alt => "avatar", :src => update.author.avatar_url}/
+        - if update.author.avatar_url.eql? Author::DEFAULT_AVATAR
+          %img{:alt => "avatar", :src => asset_path(update.author.avatar_url)}/
+        - else 
+          %img{:alt => "avatar", :src => update.author.avatar_url}/
       = update.author.username
   .update-text
     .content

diff --git a/app/views/updates/_list.html.haml b/app/views/updates/_list.html.haml
@@ -10,7 +10,10 @@
       .author.vcard
         .avatar
           %a.url{:href => update.author.url}
-            %img.photo{:alt => "avatar", :src => update.author.avatar_url}/
+            - if update.author.avatar_url.eql? Author::DEFAULT_AVATAR
+              %img.photo{:alt => "avatar", :src => asset_path(update.author.avatar_url)}/
+            - else
+              %img.photo{:alt => "avatar", :src => update.author.avatar_url}/
         %span.fn
           %a.url{:href => update.author.url}
             = update.author.display_name