diff --git a/app/controllers/admin/seminars_controller.rb b/app/controllers/admin/seminars_controller.rb index 04cd3d3..5c2216b 100644 --- a/app/controllers/admin/seminars_controller.rb +++ b/app/controllers/admin/seminars_controller.rb @@ -25,7 +25,7 @@ class Admin::SeminarsController < OrbitAdminController access_level = OrbitHelper.user_access_level? if (access_level.nil? || access_level == "user") && (@seminar.organizer_id != current_user.member_profile_id rescue true) render_401 - elsif access_level == "sub_manager" && @seminar && !(OrbitHelper.user_can_edit(@seminar)) + elsif access_level == "sub_manager" && @seminar && !(OrbitHelper.user_can_edit?(@seminar)) render_401 end end diff --git a/lib/seminar/engine.rb b/lib/seminar/engine.rb index a84c45d..394f173 100644 --- a/lib/seminar/engine.rb +++ b/lib/seminar/engine.rb @@ -25,7 +25,7 @@ module Seminar :link_path=>"new_admin_seminar_path" , :priority=>2, :active_for_action=>{'admin/seminars'=>'new'}, - :available_for => 'managers' + :available_for => 'sub_managers' context_link 'categories', :link_path=>"admin_module_app_categories_path" , :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'seminar').id}", @@ -35,17 +35,17 @@ module Seminar :available_for => 'managers' context_link 'seminar.set_seminar_items', :link_path=>"admin_seminar_items_path" , - :priority=>3, + :priority=>4, :active_for_action=>{'admin/seminars'=>'seminar_items'}, :available_for => 'managers' context_link 'seminar.set_seminar_agreements', :link_path=>"admin_seminar_agreements_path" , - :priority=>3, + :priority=>5, :active_for_action=>{'admin/seminars'=>'seminar_agreements'}, :available_for => 'managers' context_link 'seminar.enquiry_for_applicants', :link_path=>"admin_seminar_enquiry_for_applicants_path" , - :priority=>3, + :priority=>6, :active_for_action=>{'admin/seminars'=>'enquiry_for_applicants'}, :available_for => 'users' end