Merge branch 'master' of git://github.com/LindseyB/rstat.us

kplawver · Mar 24, 2011 · 7e2241e · 7e2241e
2 parents 1ca86b8 + 9f2a859
commit 7e2241e
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/views/_updates.haml b/views/_updates.haml
@@ -12,14 +12,15 @@
         %a{:href => update.url}= update.created_at.ago_in_words
       .reply
         -# when @timeline is true, this is a list on the user's page
-        -unless @timeline.nil?
-          %a{:href => "javascript:share('#{update.author.username}', '#{update.id}')"} share
-          |
-          %a{:href => "javascript:reply('#{update.author.username}')"} reply
-        -else
-          %a{:href => "/?share=#{update.id}"} share
-          |
-          %a{:href => "/?reply=#{update.author.username}"} reply
+        -unless current_user.nil? or (current_user.username == update.author.username)
+          -unless @timeline.nil? 
+            %a{:href => "javascript:share('#{update.author.username}', '#{update.id}')"} share
+            |
+            %a{:href => "javascript:reply('#{update.author.username}')"} reply
+          -else
+            %a{:href => "/?share=#{update.id}"} share
+            |
+            %a{:href => "/?reply=#{update.author.username}"} reply
 - if updates.empty?
   .empty
     There's no updates here yet