* [task#135327,doing,1h] process confirmStoryChange button.

This commit is contained in:
tianshujie
2024-12-30 09:51:11 +08:00
committed by 刘刚
parent c10c3ebd11
commit df03eddc8c
4 changed files with 20 additions and 1 deletions
+2
View File
@@ -4789,6 +4789,8 @@ class executionModel extends model
if(!common::hasDBPriv($task, 'task', 'confirmStoryChange')) continue;
$clickable = $this->task->isClickable($task, 'confirmStoryChange');
$task->actions[] = array('name' => 'confirmStoryChange', 'disabled' => !$clickable);
$task = $this->task->processConfirmStoryChange($task);
}
else
{
+2
View File
@@ -67,6 +67,8 @@ foreach($tableData as $task)
$task->canAssignTo = $canAssignTo ? common::hasDBPriv($task, 'task', 'assignTo') : false;
if(helper::isZeroDate($task->deadline)) $task->deadline = '';
if(helper::isZeroDate($task->estStarted)) $task->estStarted = '';
$task = $this->task->processConfirmStoryChange($task);
}
if($config->edition == 'ipd')
+1
View File
@@ -72,6 +72,7 @@ foreach($tasks as $task)
{
if(!isset($task->rawStatus)) $task->rawStatus = $task->status;
$task->status = $this->processStatus('task', $task);
if($app->rawMethod == 'contribute') $task = $this->task->processConfirmStoryChange($task);
}
$data = array_values($tasks);
+15 -1
View File
@@ -90,6 +90,20 @@ if($task->fromBug)
}
if(!$task->fromBug && $task->story)
{
$disabledConirmStoryChange = false;
$hintConirmStoryChange = '';
if(empty($task->team) && !empty($task->assignedTo) && $task->assignedTo != $this->app->user->account)
{
$disabledConirmStoryChange = true;
$hintConirmStoryChange = $lang->task->disabledHint->assignedConfirmStoryChange;
}
elseif(!empty($task->team))
{
$taskMembers = !empty($task->team) ? array_column($task->team, 'account') : array();
$disabledConirmStoryChange = !in_array($this->app->user->account, $taskMembers);
if($disabledConirmStoryChange) $hintConirmStoryChange = $lang->task->disabledHint->memberConfirmStoryChange;
}
$storyDetailProps = array
(
'control' => 'detailCard',
@@ -100,7 +114,7 @@ if(!$task->fromBug && $task->story)
'toolbar' => $task->needConfirm ? array
(
array('text' => $lang->task->storyChange, 'class' => 'ghost pointer-events-none'),
array('text' => $lang->confirm, 'type' => 'primary', 'class' => 'ajax-submit', 'url' => createLink('task', 'confirmStoryChange', "taskID={$task->id}"))
array('text' => $lang->confirm, 'type' => 'primary', 'class' => 'ajax-submit', 'url' => createLink('task', 'confirmStoryChange', "taskID={$task->id}"), 'disabled' => $disabledConirmStoryChange, 'hint' => $hintConirmStoryChange)
) : null,
'sections' => array
(