forked from spen/seminar
Merge branch 'master' into 'master'
Fix bug. See merge request spen/seminar!29
This commit is contained in:
commit
3744369aa1
|
@ -31,6 +31,7 @@ class Admin::SeminarsController < OrbitAdminController
|
|||
end
|
||||
def check_permission_for_seminar
|
||||
OrbitHelper.set_params(params,current_user)
|
||||
OrbitHelper.set_this_module_app("seminar")
|
||||
access_level = OrbitHelper.user_access_level?
|
||||
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)
|
||||
|
@ -391,6 +392,7 @@ class Admin::SeminarsController < OrbitAdminController
|
|||
|
||||
@seminars = search_data(@seminars,[:title]).page(params[:page]).per(10)
|
||||
OrbitHelper.set_params(params,current_user)
|
||||
OrbitHelper.set_this_module_app("seminar")
|
||||
@access_level = OrbitHelper.user_access_level?
|
||||
@can_edit = true
|
||||
if @access_level == "user" || @access_level.nil?
|
||||
|
|
Loading…
Reference in New Issue