456
/
seminar2_old
forked from spen/seminar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix bug.' (#8) from 123/seminar:master into master 

Reviewed-on: spen/seminar#8
This commit is contained in:
chiu 2023-03-17 07:59:37 +00:00
parent f25c6b6934 4fa7a17372
commit 55d504d0d9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/seminars_controller.rb
View File

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

8
lib/seminar/engine.rb
View File

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