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

Got abilities working on index; next need to separate users from members from cards.

Browse Source
This commit is contained in:
Will Bradley
2012-09-15 18:41:55 -07:00
parent 0bc5858101
commit 93e77b692f
7 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@@ -7,7 +7,7 @@ class UsersController < ApplicationController
def index
#@users = User.all
#authorize! :read, @users
respond_to do |format|
format.html # index.html.erb
format.json { render :json => @users }

12
app/models/ability.rb
View File

@@ -2,13 +2,13 @@ class Ability
include CanCan::Ability
def initialize(user)
if user.admin?
can :manage, :all
else
can :read, User do |u|
u.id == user.id
if !user.nil?
if user.admin?
can :manage, :all
else
can :read, User, :id => user.id
end
end
end
# Define abilities for the passed in user here. For example:
#
# user ||= User.new # guest user (not logged in)

6
app/views/layouts/application.html.erb
View File

@@ -8,10 +8,12 @@
</head>
<body>
<div id="header">
<a href="/users">Users</a>
<a href="/door_logs">Logs</a>
<%= link_to 'Users', users_path if user_signed_in? %>
<%= link_to 'Logs', door_logs_path if user_signed_in? %>
<%= link_to 'Profile', edit_user_registration_path if user_signed_in? %>
<%= link_to 'Sign out', destroy_user_session_path, :method => :delete if user_signed_in? %>
<%= link_to 'Sign in', new_user_session_path unless user_signed_in? %>
<%= link_to 'Sign up', new_user_registration_path unless user_signed_in? %>
</div>
<p class="notice"><%= notice %></p>
<p class="alert"><%= alert %></p>

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

@@ -12,8 +12,9 @@
<th></th>
<th></th>
</tr>
<% @users.each do |user| %>
<% if !@users.blank? %>
<% @users.each do |user| %>
<tr>
<td><%= user.name %></td>
<td><%= user.card_id %></td>
@@ -23,6 +24,7 @@
<td><%= link_to 'Edit', edit_user_path(user) %></td>
<td><%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% end %>
<% end %>
</table>