Merge pull request #977 from differentreality/fix_admin_registrations

fix admin/registrations#update

app/views/admin/registrations/edit.html.haml

@@ -2,12 +2,14 @@
   .col-md-12
     .page-header
       %h1
-        Registration for #{@user.username}
+        Registration for #{@user.username} (#{@user.email})
+
+        = link_to 'Edit User', edit_admin_user_path(@user), class: 'btn btn-primary pull-right' if can? :edit, @user
 .row
   .col-md-6
     = semantic_form_for(@registration, url: admin_conference_registration_path(@conference.short_title, @registration)) do |f|
       = f.inputs 'Personal Information' do
-        = f.fields_for :user do |u|
+        = semantic_fields_for  :user do |u|
           = u.input :name, as: :string
           = u.input :nickname, as: :string
           = u.input :affiliation, placeholder: 'Company/User Group/nothing', as: :string

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

@@ -27,10 +27,11 @@
             %td
               = registration.id
             %td
-              = registration.name
-              - registration.user.roles.each do |role|
-                - if role.resource == @conference
-                  %span.label.label-info= role.name.titleize
+              = registration.name.present? ? registration.name : registration.username
+              %br
+              - registration.user.roles.where(resource: @conference).each do |role|
+                %span.label.label-info
+                  = role.name.titleize
             %td
               = registration.email
             %td

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

@@ -40,9 +40,9 @@
                   = '...'
               - else
                 None
-            - if can? :show, user
-              %td
+            %td
+              - if can? :show, user
                 = link_to 'View', admin_user_path(user), class: 'btn btn-success'
-            - if can? :update, user
-              %td
+            %td
+              - if can? :update, user
                 = link_to 'Edit', edit_admin_user_path(user), class: 'btn btn-primary'