diff --git a/extension/lite/group/ext/view/copy.lite.html.hook.php b/extension/lite/group/ext/view/copy.lite.html.hook.php new file mode 100644 index 0000000000..b589a10995 --- /dev/null +++ b/extension/lite/group/ext/view/copy.lite.html.hook.php @@ -0,0 +1,6 @@ + diff --git a/framework/base/router.class.php b/framework/base/router.class.php index b1caa1c0c8..b8d41b31ec 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -694,7 +694,9 @@ class baseRouter public function setVision() { $account = isset($_SESSION['user']) ? $_SESSION['user']->account : ''; - $vision = $this->dbh->query("SELECT * FROM " . TABLE_CONFIG . " WHERE owner = '$account' AND `key` = 'vision' LIMIT 1")->fetch(); + + if($this->config->installed) $vision = $this->dbh->query("SELECT * FROM " . TABLE_CONFIG . " WHERE owner = '$account' AND `key` = 'vision' LIMIT 1")->fetch(); + $this->config->vision = $vision ? $vision->value : 'rnd'; } diff --git a/module/user/model.php b/module/user/model.php index 048fa01edf..2a3397ca44 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -931,6 +931,7 @@ class userModel extends model $groups = $this->dao->select('t1.acl, t1.project')->from(TABLE_GROUP)->alias('t1') ->leftJoin(TABLE_USERGROUP)->alias('t2')->on('t1.id=t2.`group`') ->where('t2.account')->eq($account) + ->andWhere('t1.vision')->eq($this->config->vision) ->andWhere('t1.role')->ne('projectAdmin') ->andWhere('t1.role')->ne('limited') ->fetchAll(); @@ -991,7 +992,8 @@ class userModel extends model ->leftJoin(TABLE_USERGROUP)->alias('t2')->on('t1.id = t2.`group`') ->leftJoin(TABLE_GROUPPRIV)->alias('t3')->on('t2.`group` = t3.`group`') ->where('t2.account')->eq($account) - ->andWhere('t1.project')->eq(0); + ->andWhere('t1.project')->eq(0) + ->andWhere('t1.vision')->eq($this->config->vision); } $stmt = $sql->query();