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

Merge branch 'sgm_task' into 'sprint/zentaopms230'

Browse Source 
* Code for task #65278.

See merge request easycorp/zentaopms!4995
This commit is contained in:
孙广明
2022-08-17 08:14:18 +00:00
parent 6d987182a8 6a1bb3f756
commit 583055fee3
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+16 -7
View File
@@ -778,7 +778,7 @@ class task extends control
if(!empty($task->team) and $task->mode == 'multi')
{
return $this->editTeam($executionID, $task, $kanbanGroup);
return $this->editTeam($executionID, $task, $kanbanGroup, $from);
}
if(!empty($_POST))
@@ -2320,10 +2320,11 @@ class task extends control
* @param int $requestID
* @param object $task
* @param string $kanbanGroup
* @param string $from
* @access public
* @return void
*/
public function editTeam($executionID, $task, $kanbanGroup = 'default')
public function editTeam($executionID, $task, $kanbanGroup = 'default', $from = '')
{
$taskID = $task->id;
$this->commonAction($taskID);
@@ -2349,7 +2350,17 @@ class task extends control
{
$task = $this->task->getById($taskID);
$execution = $this->execution->getByID($task->execution);
if(($this->app->tab == 'execution' or $this->config->vision == 'lite') and $this->app->tab == 'execution')
if(($this->app->tab == 'execution' or ($this->config->vision == 'lite' and $this->app->tab == 'project' and $this->session->kanbanview == 'kanban')) and $execution->type == 'kanban')
{
$rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
$kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
$kanbanData = json_encode($kanbanData);
return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
}
if($from == 'taskkanban')
{
$rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
$kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue);
@@ -2357,10 +2368,8 @@ class task extends control
return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
}
else
{
return print(js::closeModal('parent.parent', 'this'));
}
return print(js::closeModal('parent.parent', 'this'));
}
return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
module/task/model.php
Regular → Executable
-2
View File
@@ -1530,8 +1530,6 @@ class taskModel extends model
->remove('comment,showModule,team,teamEstimate,teamConsumed,teamLeft')
->get();
if($task->consumed < $oldTask->consumed) return print(js::error($this->lang->task->error->consumedSmall));
$teams = array();
if(count(array_unique(array_filter($this->post->team))) > 1)
{
module/task/view/editteam.html.php
Regular → Executable
+1 -1
View File
@@ -82,7 +82,7 @@
<span class='input-group-addon'><?php echo $lang->task->estimate?></span>
<?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
<span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
<?php echo html::input("teamConsumed[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
<?php echo html::input("teamConsumed[]", '', "class='form-control text-center' readonly placeholder='{$lang->task->hour}'")?>
<span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
<?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
</div>