Convert OpenID authentication to generic third party authentication

[rails.git] / app / helpers / user_roles_helper.rb

diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb
index 369efca5a005fef5e2642a3eb18fafe49f6599b7..690cccdca2ad7e15a46ba5f9c2f45791187a5eb4 100644 (file)
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,10 +1,10 @@
 module UserRolesHelper
   def role_icons(user)
 module UserRolesHelper
   def role_icons(user)

-    UserRole::ALL_ROLES.reduce("".html_safe) { |s,r| s + " " + role_icon(user, r) }
+    UserRole::ALL_ROLES.reduce("".html_safe) { |a, e| a + " " + role_icon(user, e) }

   end
 
   def role_icon(user, role)
   end
 
   def role_icon(user, role)

-    if @user and @user.administrator?
+    if @user && @user.administrator?

       if user.has_role?(role)
         image = "roles/#{role}.png"
         alt = t("user.view.role.revoke.#{role}")
       if user.has_role?(role)
         image = "roles/#{role}.png"
         alt = t("user.view.role.revoke.#{role}")


@@ -18,7 +18,7 @@ module UserRolesHelper
         url = grant_role_path(:display_name => user.display_name, :role => role)
         confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role)
       end
         url = grant_role_path(:display_name => user.display_name, :role => role)
         confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role)
       end

-    elsif user.has_role?(role) 
+    elsif user.has_role?(role)

       image = "roles/#{role}.png"
       alt = t("user.view.role.#{role}")
       title = t("user.view.role.#{role}")
       image = "roles/#{role}.png"
       alt = t("user.view.role.#{role}")
       title = t("user.view.role.#{role}")


@@ -26,10 +26,7 @@ module UserRolesHelper
 
     if image
       icon = image_tag(image, :size => "20x20", :border => 0, :alt => alt, :title => title)
 
     if image
       icon = image_tag(image, :size => "20x20", :border => 0, :alt => alt, :title => title)

-
-      if url
-        icon = link_to(icon, url, :method => :post, :confirm => confirm)
-      end
+      icon = link_to(icon, url, :method => :post, :confirm => confirm) if url

     end
 
     icon
     end
 
     icon