Skip to content

Commit

Permalink
Administrators can view all courses
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordan Byron committed Nov 15, 2011
1 parent 8cc577e commit 082cdf6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion app/controllers/courses/base.rb
Expand Up @@ -10,7 +10,7 @@ def find_course
end

def course_members_only
unless @course.users.include?(current_user)
unless @course.users.include?(current_user) || current_access_level.allows?(:view_all_courses)
flash[:error] = "You are not enrolled in this course!"
redirect_to courses_path
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/courses_controller.rb
Expand Up @@ -48,7 +48,7 @@ def find_course
end

def course_members_only
unless @course.users.include?(current_user)
unless @course.users.include?(current_user) || current_access_level.allows?(:view_all_courses)
flash[:error] = "You are not enrolled in this course!"
redirect_to courses_path
end
Expand Down
25 changes: 13 additions & 12 deletions config/access_level_definitions.rb
@@ -1,10 +1,10 @@
AccessLevel::User.instance_eval do
define "guest",
:permissions => []

define "applicant",
:permissions => []

define "student",
:permissions => [:view_directory, :view_courses]

Expand All @@ -18,24 +18,25 @@

define "admin",
:parent => "alumnus",
:permissions => [:manage_users, :manage_documents, :update_admissions_status]
:permissions => [:manage_users, :manage_documents, :update_admissions_status,
:view_all_courses]
end

AccessLevel::Course.instance_eval do
define "student",
:permissions => [:comment, :create_submissions]
define "mentor",
:permissions => [:comment, :create_submissions]

define "mentor",
:permissions => [:comment]
define "assistant instructor",

define "assistant instructor",
:parent => "mentor",
:permissions => []
define "visiting teacher",

define "visiting teacher",
:parent => "ta",
:permissions => []
define "instructor",

define "instructor",
:permissions => [:comment, :create_assignments]
end

0 comments on commit 082cdf6

Please sign in to comment.