From ccc11c4e4bcdd4135fa317bac76760ab3c71cc68 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Mon, 28 Feb 2022 15:18:57 +0800 Subject: [PATCH] * Hide preference and tutorial. --- framework/control.class.php | 2 +- module/index/js/index.js | 2 +- module/user/model.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/control.class.php b/framework/control.class.php index 16fa798f1c..83495d0913 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -117,7 +117,7 @@ class control extends baseControl if($this->app->getModuleName() == 'my' and $this->app->getMethodName() == 'changepassword') return true; if($this->app->getModuleName() == 'my' and $this->app->getMethodName() == 'preference') return true; - if(!isset($this->config->preferenceSetted)) + if(!isset($this->config->preferenceSetted) and $this->config->vision == 'rnd') { $this->locate(helper::createLink('my', 'preference')); } diff --git a/module/index/js/index.js b/module/index/js/index.js index 72d58ff2b2..28d39c8060 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -1,6 +1,6 @@ (function() { - if(showFeatures) + if(showFeatures && vision == 'rnd') { /* Show features dialog. */ new $.zui.ModalTrigger({url: $.createLink('misc', 'features'), type: 'iframe', width: 900, showHeader: false, backdrop: 'static'}).show(); diff --git a/module/user/model.php b/module/user/model.php index 919f7c08fd..f8257b542c 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -458,7 +458,7 @@ class userModel extends model $prev['dept'] = $data[$i]->dept; $prev['role'] = $data[$i]->role; $prev['group'] = $data[$i]->group; - $prev['visions'] = $users->visions[$i]; + $prev['visions'] = $visions; $prev['password'] = $users->password[$i]; } }