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

Merge branch 'master' into 'master' 

Fix bug.

See merge request spen/seminar!29
This commit is contained in:
chiu 2021-11-18 11:35:28 +00:00
parent b6b12295df 72a5ed3360
commit 3744369aa1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ class Admin::SeminarsController < OrbitAdminController
end end
def check_permission_for_seminar def check_permission_for_seminar
OrbitHelper.set_params(params,current_user) OrbitHelper.set_params(params,current_user)
OrbitHelper.set_this_module_app("seminar")
access_level = OrbitHelper.user_access_level? access_level = OrbitHelper.user_access_level?
if (access_level.nil? || access_level == "user") if (access_level.nil? || access_level == "user")
unless (@seminar.reviewer_ids.include?(current_user.member_profile_id.to_s) rescue false) || (@seminar.organizer_id == current_user.member_profile_id rescue false) unless (@seminar.reviewer_ids.include?(current_user.member_profile_id.to_s) rescue false) || (@seminar.organizer_id == current_user.member_profile_id rescue false)
@ -391,6 +392,7 @@ class Admin::SeminarsController < OrbitAdminController
@seminars = search_data(@seminars,[:title]).page(params[:page]).per(10) @seminars = search_data(@seminars,[:title]).page(params[:page]).per(10)
OrbitHelper.set_params(params,current_user) OrbitHelper.set_params(params,current_user)
OrbitHelper.set_this_module_app("seminar")
@access_level = OrbitHelper.user_access_level? @access_level = OrbitHelper.user_access_level?
@can_edit = true @can_edit = true
if @access_level == "user" || @access_level.nil? if @access_level == "user" || @access_level.nil?