From 060559f1aed386c25f588d3f453b98c729bdf357 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 29 Apr 2019 15:35:04 +0800 Subject: [PATCH] * finish task #5439. --- module/user/model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/user/model.php b/module/user/model.php index 51dab65d77..59b90259b0 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1332,9 +1332,9 @@ class userModel extends model $userView = $this->dao->select('*')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch(); if(empty($userView)) $userView = $this->computeUserView($account); - if(isset($_SESSION['user']->admin)) $isadmin = $this->session->user->admin; - if(!isset($isadmin)) $isadmin = strpos($this->app->company->admins, ",{$account},") !== false; - if(!empty($acls['products']) and !$isadmin) + if(isset($_SESSION['user']->admin)) $isAdmin = $this->session->user->admin; + if(!isset($isAdmin)) $isAdmin = strpos($this->app->company->admins, ",{$account},") !== false; + if(!empty($acls['products']) and !$isAdmin) { $grantProducts = ''; foreach($acls['products'] as $productID) @@ -1343,7 +1343,7 @@ class userModel extends model } $userView->products = $grantProducts; } - if(!empty($acls['projects']) and !$isadmin) + if(!empty($acls['projects']) and !$isAdmin) { $grantProjects = ''; foreach($acls['projects'] as $projectID)