diff --git a/app/models/ability.rb b/app/models/ability.rb index 64ae4ed..cf66197 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -16,10 +16,6 @@ class Ability can :read, User, :id => user.id #TODO: why can users update themselves? can :read, UserCertification, :user_id => user.id - # Admins can manage all - if user.admin? - can :manage, :all - end # Instructors can manage certs and see users if user.instructor? can :manage, Certification @@ -32,6 +28,11 @@ class Ability can :read, UserCertification end + # Admins can manage all + if user.admin? + can :manage, :all + end + # Prevent all destruction for now cannot :destroy, User cannot :destroy, Card diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index b45e344..eb528b1 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -4,10 +4,14 @@

You can sign up to become a member here!

<% end %> + +<% if user_signed_in? && current_user.orientation.blank? then %> +

There's a lot more to see here, but our records show you haven't completed the new member orientation yet. If that's incorrect, please contact a volunteer.

+<% end %> <% if user_signed_in? && current_user.member.to_i < current_user.member_level.to_i then %>

Looks like we haven't acknowledged a recent payment for you yet. This could be because we're slow, or this app just got started, but if in doubt please see your profile for payment instructions, or consider updating your membership level to something accurate.
Thanks for supporting HeatSync!

<% end %> -<% if ((can? :read, User) && (@recent_user_names.count > 1)) then %> +<% if ((can? :read, @recent_user_names) && (@recent_user_names.count > 1)) then %>

New People: