From e7205ddc5ab690bb7729b4cdc237ed58857c60e3 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 6 Mar 2019 16:00:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=B9=8F=E7=A8=8B=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bd7e961a..e6645b3f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -318,11 +318,15 @@ module ApplicationHelper # TPM查看权限 # result一般为页面权限 def shixun_view_allow shixun, result = nil - if User.current.manager_of_shixun?(shixun) + if params[:openi].to_i == 1 result ? false : true else - if shixun.status == 0 || (shixun.use_scope == 1 && !shixun.schools.map(&:name).include?(User.current.school_name)) - result ? true : (render_403) + if User.current.manager_of_shixun?(shixun) + result ? false : true + else + if shixun.status == 0 || (shixun.use_scope == 1 && !shixun.schools.map(&:name).include?(User.current.school_name)) + result ? true : (render_403) + end end end end From 9c3772310a4a869f874cc64a9fde2f545df007a1 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 6 Mar 2019 19:51:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/update.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/update.html b/public/update.html index 43ae62e2..b2667a27 100644 --- a/public/update.html +++ b/public/update.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - Trustie 500 error + 系统通知 @@ -44,7 +44,7 @@ }); - +