fixes

app/views/admin/users/index.html.haml

@@ -40,9 +40,9 @@
             %td
               = user.registrations.where(attended: true).count
             %td
-              - unless user.show_roles.blank?
-                = user.show_roles.first(2).map { |x| x[0].titleize + ' ' + x[1] }.join ', '
-                - if user.show_roles.count > 2
+              - unless user.get_roles.blank?
+                = show_roles(user.get_roles.first(2))
+                - if user.get_roles.count > 2
                   = '...'
             - if can? :show, user
               %td

app/views/admin/users/show.html.haml

@@ -1,3 +1,6 @@
+- if can? :edit, @user
+  .pull-right
+    = link_to "Edit", edit_admin_user_path(@user), class: 'btn btn-primary'
 %table.table
   - @show_attributes.each do |attr|
     %tr
@@ -6,6 +9,6 @@
           = attr.capitalize.gsub('_', ' ')
       - if attr == 'roles'
         %td
-          = @user.show_roles.map { |x| x[0].titleize + ' ' + x[1] }.join ', '
+          = show_roles(@user.get_roles)
       - else
         %td= @user.send(attr)

app/views/layouts/_admin_sidebar.html.haml

@@ -27,7 +27,7 @@
       = link_to(admin_conference_path(@conference.short_title)) do
         %span.fa.fa-tachometer
         Dashboard
-  - if can? :update, @conference
+  - if can? :show, @conference
     %li{:class=> "#{active_nav_li(edit_admin_conference_path(@conference.short_title))}"}
       = link_to(edit_admin_conference_path(@conference.short_title)) do
         %span.fa.fa-home
@@ -38,16 +38,16 @@
             = link_to(edit_admin_conference_contact_path(@conference.short_title)) do
               %span.fa.fa-envelope-o
               Contact
-          - if can? :index, @conference.commercials.build
-            %li{:class=> "#{active_nav_li(admin_conference_commercials_path(@conference.short_title))}"}
-              = link_to(admin_conference_commercials_path(@conference.short_title)) do
-                %span.fa.fa-film
-                Commercials
-          - if can? :update, @conference.photos.build
-            %li{:class=> "#{active_nav_li(admin_conference_photos_path(@conference.short_title))}"}
-              = link_to(admin_conference_photos_path(@conference.short_title)) do
-                %span.fa.fa-picture-o
-                Photos
+      - if can? :index, @conference.commercials.build
+        %li{:class=> "#{active_nav_li(admin_conference_commercials_path(@conference.short_title))}"}
+          = link_to(admin_conference_commercials_path(@conference.short_title)) do
+            %span.fa.fa-film
+            Commercials
+      - if can? :update, @conference.photos.build
+        %li{:class=> "#{active_nav_li(admin_conference_photos_path(@conference.short_title))}"}
+          = link_to(admin_conference_photos_path(@conference.short_title)) do
+            %span.fa.fa-picture-o
+            Photos
   - if can? :update, @conference.events.build
     %li{:class=> active_nav_li(admin_conference_events_path(@conference.short_title))}
       = link_to(admin_conference_events_path(@conference.short_title)) do