Allowed admins to see hidden users, added "no orientation" message to main page and hid new people from non-oriented people

This commit is contained in:
Will Bradley 2013-02-09 02:51:35 -07:00
parent f1b752a4c4
commit 3f3eb1ed65
2 changed files with 10 additions and 5 deletions

View File

@ -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

View File

@ -4,10 +4,14 @@
<p>You can sign up to become a member here!</p>
<% end %>
<% if user_signed_in? && current_user.orientation.blank? then %>
<p class="alert">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.</p>
<% end %>
<% if user_signed_in? && current_user.member.to_i < current_user.member_level.to_i then %>
<p class="alert">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.<br/>Thanks for supporting HeatSync!</p>
<% end %>
<% if ((can? :read, User) && (@recent_user_names.count > 1)) then %>
<% if ((can? :read, @recent_user_names) && (@recent_user_names.count > 1)) then %>
<h2>New People:</h2>
<ul>
<% @recent_user_names.each do |user| %>