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

* Reduce use hasPriv.

Browse Source
This commit is contained in:
songchenxuan
2023-06-28 13:48:13 +08:00
parent 22a691a2fd
commit 4c7cb11170
2 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module/execution/view/task.html.php
View File

@@ -269,18 +269,24 @@ body {margin-bottom: 25px;}
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<?php
$privs['canBatchEdit'] = common::hasPriv('task', 'batchEdit', !empty($task) ? $task : null);
$privs['canBatchClose'] = (common::hasPriv('task', 'batchClose', !empty($task) ? $task : null) and strtolower($browseType) != 'closed');
$privs['canBatchCancel'] = common::hasPriv('task', 'batchCancel', !empty($task) ? $task : null);
$privs['canBatchChangeModule'] = common::hasPriv('task', 'batchChangeModule', !empty($task) ? $task : null);
$privs['canBatchAssignTo'] = common::hasPriv('task', 'batchAssignTo', !empty($task) ? $task : null);
?>
<tr <?php if(!empty($task->children)) echo 'class="table-parent" '; ?>data-id='<?php echo $task->id;?>' data-status='<?php echo $task->status?>' data-estimate='<?php echo $task->estimate?>' data-consumed='<?php echo $task->consumed?>' data-left='<?php echo $task->left?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
{
$this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');
}
$this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', false, false, $privs);
}?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', false, $showBranch);?>
<?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', false, $showBranch, $privs);?>
<?php endif;?>
</tr>
<?php if(!empty($task->children)):?>
@@ -288,16 +294,24 @@ body {margin-bottom: 25px;}
<?php foreach($task->children as $key => $child):?>
<?php $class = $i == 0 ? ' table-child-top' : '';?>
<?php $class .= ($i + 1 == count($task->children)) ? ' table-child-bottom' : '';?>
<?php
$childPrivs['canBatchEdit'] = common::hasPriv('task', 'batchEdit', !empty($child) ? $child : null);
$childPrivs['canBatchClose'] = (common::hasPriv('task', 'batchClose', !empty($child) ? $child : null) and strtolower($browseType) != 'closed');
$childPrivs['canBatchCancel'] = common::hasPriv('task', 'batchCancel', !empty($child) ? $child : null);
$childPrivs['canBatchChangeModule'] = common::hasPriv('task', 'batchChangeModule', !empty($child) ? $child : null);
$childPrivs['canBatchAssignTo'] = common::hasPriv('task', 'batchAssignTo', !empty($child) ? $child : null);
?>
<tr class='table-children<?php echo $class;?> parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>' data-consumed='<?php echo $child->consumed?>' data-left='<?php echo $child->left?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
$this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);
$this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true, false, $childPrivs);
}?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true, $showBranch);?>
<?php foreach($customFields as $field) $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true, $showBranch, $childPrivs);?>
<?php endif;?>
</tr>
<?php $i ++;?>

24
module/task/model.php
View File

@@ -3777,17 +3777,29 @@ class taskModel extends model
* @param string $mode
* @param bool $child
* @param bool $showBranch
* @param array $privs
*
* @access public
* @return void
*/
public function printCell($col, $task, $users, $browseType, $branchGroups, $modulePairs = array(), $mode = 'datatable', $child = false, $showBranch = false)
public function printCell($col, $task, $users, $browseType, $branchGroups, $modulePairs = array(), $mode = 'datatable', $child = false, $showBranch = false, $privs = array())
{
$canBatchEdit = common::hasPriv('task', 'batchEdit', !empty($task) ? $task : null);
$canBatchClose = (common::hasPriv('task', 'batchClose', !empty($task) ? $task : null) and strtolower($browseType) != 'closed');
$canBatchCancel = common::hasPriv('task', 'batchCancel', !empty($task) ? $task : null);
$canBatchChangeModule = common::hasPriv('task', 'batchChangeModule', !empty($task) ? $task : null);
$canBatchAssignTo = common::hasPriv('task', 'batchAssignTo', !empty($task) ? $task : null);
if(!empty($privs))
{
$canBatchEdit = $privs['canBatchEdit'];
$canBatchClose = $privs['canBatchClose'];
$canBatchCancel = $privs['canBatchCancel'];
$canBatchChangeModule = $privs['canBatchChangeModule'];
$canBatchAssignTo = $privs['canBatchAssignTo'];
}
else
{
$canBatchEdit = common::hasPriv('task', 'batchEdit', !empty($task) ? $task : null);
$canBatchClose = (common::hasPriv('task', 'batchClose', !empty($task) ? $task : null) and strtolower($browseType) != 'closed');
$canBatchCancel = common::hasPriv('task', 'batchCancel', !empty($task) ? $task : null);
$canBatchChangeModule = common::hasPriv('task', 'batchChangeModule', !empty($task) ? $task : null);
$canBatchAssignTo = common::hasPriv('task', 'batchAssignTo', !empty($task) ? $task : null);
}
$canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchCancel or $canBatchChangeModule or $canBatchAssignTo);
$storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));