Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sgm_details' into 'master'

Browse Source 
* Code for code error.

See merge request easycorp/zentaopms!4102
This commit is contained in:
王怡栋
2022-06-23 06:20:57 +00:00
parent e0fa7f1ea2 6d88c0c22b
commit 88427c47a9
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/view/manageprojectadmin.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
<tr>
<th class='text-center w-300px'><?php echo $lang->group->inside;?></th>
<th class='text-center'><?php echo $lang->group->object;?></th>
<th class='w-100px'><?php echo $lang->group->allCheck . " <span data-toggle='tooltip' class='text-help' title='{$lang->group->allTips}' ><i class='icon-help'></i></sapn>";?></th>
<th class='w-70px'><?php echo $lang->group->allCheck . " <span data-toggle='tooltip' class='text-help' title='{$lang->group->allTips}' ><i class='icon-help'></i></sapn>";?></th>
<th class='w-100px'></th>
</tr>
<?php if($config->systemMode == 'new'):?>
module/story/control.php
+4 -4
View File
@@ -332,7 +332,7 @@ class story extends control
/* Get reviewers. */
$reviewers = $product->reviewer;
if(!$reviewers and $product->acl != 'open') $reviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '');
if(!$reviewers and $product->acl != 'open') $reviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '', '');
/* Set Custom. */
foreach(explode(',', $this->config->story->list->customCreateFields) as $field) $customFields[$field] = $this->lang->story->$field;
@@ -520,7 +520,7 @@ class story extends control
/* Get reviewers. */
$reviewers = $product->reviewer;
if(!$reviewers and $product->acl != 'open') $reviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '');
if(!$reviewers and $product->acl != 'open') $reviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '', '');
/* Init vars. */
$planID = $plan;
@@ -752,7 +752,7 @@ class story extends control
/* Get product reviewers. */
$productReviewers = $product->reviewer;
if(!$productReviewers and $product->acl != 'open') $productReviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '');
if(!$productReviewers and $product->acl != 'open') $productReviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '', '');
/* Process the module when branch products are switched to normal products. */
if($product->type == 'normal' and !empty($story->branch)) $this->view->moduleOptionMenu += $this->tree->getModulesName($story->module);
@@ -1018,7 +1018,7 @@ class story extends control
/* Get product reviewers. */
$productReviewers = $product->reviewer;
if(!$productReviewers and $product->acl != 'open') $productReviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '');
if(!$productReviewers and $product->acl != 'open') $productReviewers = $this->loadModel('user')->getProductViewListUsers($product, '', '', '', '');
/* Assign. */
$this->view->title = $this->lang->story->change . "STORY" . $this->lang->colon . $this->view->story->title;
module/user/model.php
+8
View File
@@ -2687,6 +2687,14 @@ class userModel extends model
->fetchPairs();
}
if($admins === '')
{
$admins = $this->dao->select('account')->from(TABLE_PROJECTADMIN)
->where("CONCAT(',', products, ',')")->like("%,$product->id,%")
->orWhere('products')->eq('all')
->fetchPairs();
}
$users += $teams ? $teams : array();
$users += $stakeholders ? $stakeholders : array();
$users += $whiteList ? $whiteList : array();