This commit is contained in:
tianshujie
2022-03-25 15:00:30 +08:00
parent eca3d6a43f
commit d3e63841fa
3 changed files with 5 additions and 2 deletions
+2 -2
View File
@@ -38,12 +38,12 @@ class personnelModel extends model
}
/* Determine who can be accessed based on access control. */
$program = $this->loadModel('program')->getByID($programID);
$program = $this->loadModel('program')->getByID($programID);
$personnelList = array();
$personnelList = $this->dao->select('t2.id,t2.dept,t2.account,t2.role,t2.realname,t2.gender')->from(TABLE_USERVIEW)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account')
->where('t2.deleted')->eq(0)
->beginIF($program->acl != 'open')->andWhere("CONCAT(',', t1.programs, ',')")->like("%,$programID,%")
->beginIF($program->acl != 'open')->andWhere("CONCAT(',', t1.programs, ',')")->like("%,$programID,%")->fi()
->beginIF($deptID > 0)->andWhere('t2.dept')->eq($deptID)->fi()
->beginIF($browseType == 'bysearch')->andWhere($accessibleQuery)->fi()
->fetchAll('id');
+1
View File
@@ -12,3 +12,4 @@
#budget {border-right: 0px;}
#budgetUnit {border-left: 0px;}
#projectName {display: inline-block; width: 32%;}
#productsBox a {border-radius: 2px !important;}
+2
View File
@@ -119,7 +119,9 @@
<div class='col-sm-4 <?php if($programID) echo 'required';?>' style="padding-right: 6px;">
<div class='input-group'>
<?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
<?php if(common::hasPriv('product', 'create')):?>
<span class='input-group-addon'><?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?></span>
<?php endif;?>
</div>
</div>
</div>