will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowing users to see member activity

Browse Source
This commit is contained in:
Will Bradley 2014-01-23 17:50:00 -07:00
parent a2a9d082d8
commit aa29f30f30
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/ability.rb
View File

@ -14,8 +14,8 @@ class Ability
can [:update], Mac, :user_id => nil
can [:create,:update], Mac, :user_id => user.id
can :read, Payment, :user_id => user.id
can [:read,:new_member_report], User, :id => user.id #TODO: why can users update themselves? Maybe because Devise doesn't check users/edit?
can :read, UserCertification, :user_id => user.id
can :read, User, :id => user.id #TODO: why can users update themselves? Maybe because Devise doesn't check users/edit?
can :compose_email, User
can :send_email, User
@ -32,7 +32,7 @@ class Ability
end
# Users can see others' stuff if they've been oriented
unless user.orientation.blank?
can :read, User, :hidden => [nil,false]
can [:read,:new_member_report,:activity], User, :hidden => [nil,false]
can :read, UserCertification
end

6
app/views/users/index.html.erb
View File

@ -8,9 +8,13 @@
<% end %>
<% if current_user.admin? %>
<%= link_to 'Inactive Users', users_inactive_path %> |
<% end %>
<% if can? :activity, User %>
<%= link_to 'Recent Activity', users_activity_path %> |
<% end %>
<%= link_to 'New Members Report', users_new_member_report_path %>
<% if can? :new_member_report, User %>
<%= link_to 'New Members Report', users_new_member_report_path %>
<% end %>
<% @certifications = Certification.all.sort_by(&:id) %>
<table>