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

Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'

Browse Source 
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
This commit is contained in:
李玉春
2022-02-23 01:33:37 +00:00
parent 0805d25735 6ce7926bd8
commit 9405f7bf71
319 changed files with 11572 additions and 1545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/config.php
+5
View File
@@ -190,6 +190,11 @@ $config->task->datatable->fieldList['lastEditedDate']['fixed'] = 'no';
$config->task->datatable->fieldList['lastEditedDate']['width'] = '120';
$config->task->datatable->fieldList['lastEditedDate']['required'] = 'no';
$config->task->datatable->fieldList['activatedDate']['title'] = 'activatedDate';
$config->task->datatable->fieldList['activatedDate']['fixed'] = 'no';
$config->task->datatable->fieldList['activatedDate']['width'] = '90';
$config->task->datatable->fieldList['activatedDate']['required'] = 'no';
$config->task->datatable->fieldList['actions']['title'] = 'actions';
$config->task->datatable->fieldList['actions']['fixed'] = 'right';
$config->task->datatable->fieldList['actions']['width'] = '180';
module/task/control.php
+53 -45
View File
@@ -53,7 +53,7 @@ class task extends control
if(strpos(",{$limitedExecutions},", ",$executionID,") !== false)
{
echo js::alert($this->lang->task->createDenied);
die(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
return print(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
}
$task = new stdClass();
@@ -219,6 +219,8 @@ class task extends control
}
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $moduleIdList, 'full', 'unclosed');
if($this->config->vision == 'lite') $stories = $stories + array('', '');
/* Get block id of assinge to me. */
$blockID = 0;
if(isonlybody())
@@ -236,6 +238,8 @@ class task extends control
$position[] = $this->lang->task->common;
$position[] = $this->lang->task->create;
$projectID = $execution ? $execution->project : 0;
/* Set Custom*/
foreach(explode(',', $this->config->task->customCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
if($execution->type == 'ops') unset($customFields['story']);
@@ -248,7 +252,7 @@ class task extends control
$this->view->position = $position;
$this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('execution', 'task', "executionID=$executionID") : '';
$this->view->execution = $execution;
$this->view->executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject(0, 'undone', 0, true);
$this->view->executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject($projectID, 'undone', 0, true);
$this->view->task = $task;
$this->view->users = $users;
$this->view->storyID = $storyID;
@@ -280,7 +284,7 @@ class task extends control
if(strpos(",{$limitedExecutions},", ",$executionID,") !== false)
{
echo js::alert($this->lang->task->createDenied);
die(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
return print(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
}
$execution = $this->execution->getById($executionID);
@@ -445,7 +449,7 @@ class task extends control
{
$confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
$cancelURL = $this->server->HTTP_REFERER;
die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent'));
return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent'));
}
}
}
@@ -472,7 +476,7 @@ class task extends control
}
else
{
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
}
@@ -521,7 +525,7 @@ class task extends control
if($this->post->names)
{
$allChanges = $this->task->batchUpdate();
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
if(!empty($allChanges))
{
@@ -556,7 +560,7 @@ class task extends control
{
$confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
$cancelURL = $this->server->HTTP_REFERER;
die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent'));
return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent'));
}
}
}
@@ -564,11 +568,12 @@ class task extends control
}
}
$this->loadModel('score')->create('ajax', 'batchOther');
die(js::locate($this->session->taskList, 'parent'));
return print(js::locate($this->session->taskList, 'parent'));
}
$taskIDList = $this->post->taskIDList ? $this->post->taskIDList : die(js::locate($this->session->taskList, 'parent'));
$taskIDList = array_unique($taskIDList);
if(!$this->post->taskIDList) return print(js::locate($this->session->taskList, 'parent'));
$taskIDList = array_unique($this->post->taskIDList);
/* The tasks of execution. */
if($executionID)
@@ -654,7 +659,7 @@ class task extends control
if(dao::isError())
{
if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
die(js::error(dao::getError()));
return print(js::error(dao::getError()));
}
$actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);
@@ -718,7 +723,7 @@ class task extends control
$taskIDList = array_unique($taskIDList);
unset($_POST['taskIDList']);
$allChanges = $this->task->batchChangeModule($taskIDList, $moduleID);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
foreach($allChanges as $taskID => $changes)
{
$this->loadModel('action');
@@ -727,7 +732,7 @@ class task extends control
}
if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
}
die(js::reload('parent'));
echo js::reload('parent');
}
/**
@@ -745,7 +750,7 @@ class task extends control
$taskIDList = $this->post->taskIDList;
$taskIDList = array_unique($taskIDList);
unset($_POST['taskIDList']);
if(!is_array($taskIDList)) die(js::locate($this->createLink('execution', 'task', "executionID=$execution"), 'parent'));
if(!is_array($taskIDList)) return print(js::locate($this->createLink('execution', 'task', "executionID=$execution"), 'parent'));
$taskIDList = array_unique($taskIDList);
$muletipleTasks = $this->dao->select('root , account')->from(TABLE_TEAM)->where('type')->eq('task')->andWhere('root')->in($taskIDList)->fetchGroup('root', 'account');
@@ -757,12 +762,12 @@ class task extends control
if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue;
$changes = $this->task->assign($taskID);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
$actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);
$this->action->logHistory($actionID, $changes);
}
if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
die(js::reload('parent'));
return print(js::reload('parent'));
}
}
@@ -777,12 +782,14 @@ class task extends control
{
$this->session->set('executionList', $this->app->getURI(true), 'execution');
$this->commonAction($taskID);
$taskID = (int)$taskID;
$task = $this->task->getById($taskID, true);
if(!$task)
{
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'all')));
return print(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'all')));
}
$this->session->project = $task->project;
@@ -850,7 +857,7 @@ class task extends control
$this->executeHooks($taskID);
die(js::reload('parent'));
echo js::reload('parent');
}
/**
@@ -878,7 +885,7 @@ class task extends control
if(dao::isError())
{
if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
die(js::error(dao::getError()));
return print(js::error(dao::getError()));
}
if($this->post->comment != '' or !empty($changes))
@@ -901,7 +908,7 @@ class task extends control
$confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
unset($_GET['onlybody']);
$cancelURL = $this->createLink('task', 'view', "taskID=$taskID");
die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
}
}
}
@@ -924,7 +931,7 @@ class task extends control
return print(js::closeModal('parent.parent', 'this', "function(){parent.parent.location.reload();}"));
}
}
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
$this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->start;
@@ -950,7 +957,7 @@ class task extends control
if(!empty($_POST))
{
$changes = $this->task->recordEstimate($taskID);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
$this->loadModel('common')->syncPPEStatus($taskID);
@@ -965,7 +972,7 @@ class task extends control
$confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug");
unset($_GET['onlybody']);
$cancelURL = $this->createLink('task', 'view', "taskID=$taskID");
die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
}
}
}
@@ -1010,13 +1017,13 @@ class task extends control
if(!empty($_POST))
{
$changes = $this->task->updateEstimate($estimateID);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('task', $estimate->task, 'EditEstimate', $this->post->work);
$this->action->logHistory($actionID, $changes);
$url = $this->session->estimateList ? $this->session->estimateList : inlink('record', "taskID={$estimate->task}");
die(js::locate($url, 'parent'));
return print(js::locate($url, 'parent'));
}
$estimate = $this->task->getEstimateById($estimateID);
@@ -1039,17 +1046,17 @@ class task extends control
{
if($confirm == 'no')
{
die(js::confirm($this->lang->task->confirmDeleteEstimate, $this->createLink('task', 'deleteEstimate', "estimateID=$estimateID&confirm=yes")));
return print(js::confirm($this->lang->task->confirmDeleteEstimate, $this->createLink('task', 'deleteEstimate', "estimateID=$estimateID&confirm=yes")));
}
else
{
$estimate = $this->task->getEstimateById($estimateID);
$changes = $this->task->deleteEstimate($estimateID);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('task', $estimate->task, 'DeleteEstimate');
$this->action->logHistory($actionID, $changes);
die(js::reload('parent'));
return print(js::reload('parent'));
}
}
@@ -1075,7 +1082,7 @@ class task extends control
if(dao::isError())
{
if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
die(js::error(dao::getError()));
return print(js::error(dao::getError()));
}
$files = $this->loadModel('file')->saveUpload('task', $taskID);
@@ -1098,7 +1105,7 @@ class task extends control
$confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug", '', true);
unset($_GET['onlybody']);
$cancelURL = $this->createLink('task', 'view', "taskID=$taskID");
die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
return print(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
}
}
}
@@ -1127,7 +1134,7 @@ class task extends control
}
else
{
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
}
@@ -1180,7 +1187,7 @@ class task extends control
{
$this->loadModel('action');
$changes = $this->task->pause($taskID, $extra);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
if($this->post->comment != '' or !empty($changes))
{
@@ -1235,7 +1242,7 @@ class task extends control
{
$this->loadModel('action');
$changes = $this->task->start($taskID);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
if($this->post->comment != '' or !empty($changes))
{
@@ -1294,7 +1301,7 @@ class task extends control
$this->loadModel('action');
$changes = $this->task->close($taskID, $extra);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
if($this->post->comment != '' or !empty($changes))
{
@@ -1328,7 +1335,7 @@ class task extends control
}
else
{
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
}
@@ -1371,7 +1378,7 @@ class task extends control
}
}
die(js::reload('parent'));
echo js::reload('parent');
}
/**
@@ -1419,11 +1426,12 @@ class task extends control
$skipTasks = join(',', $skipTasks);
$confirmURL = $this->createLink('task', 'batchClose', "skipTaskIdList=$skipTasks");
$cancelURL = $this->server->HTTP_REFERER;
die(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
return print(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
}
if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
}
die(js::reload('parent'));
echo js::reload('parent');
}
/**
@@ -1445,7 +1453,7 @@ class task extends control
{
$this->loadModel('action');
$changes = $this->task->cancel($taskID, $extra);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
if($this->post->comment != '' or !empty($changes))
{
@@ -1472,7 +1480,7 @@ class task extends control
return print(js::closeModal('parent.parent', 'this'));
}
}
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
$this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->cancel;
@@ -1501,7 +1509,7 @@ class task extends control
{
$this->loadModel('action');
$changes = $this->task->activate($taskID, $extra);
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return print(js::error(dao::getError()));
if($this->post->comment != '' or !empty($changes))
{
@@ -1603,8 +1611,8 @@ class task extends control
if(isset($suspendedTasks[$taskid])) unset($tasks[$taskid]);
}
if($id) die(html::select("tasks[$id]", $tasks, '', 'class="form-control"'));
die(html::select('task', $tasks, '', 'class=form-control'));
if($id) return print(html::select("tasks[$id]", $tasks, '', 'class="form-control"'));
echo html::select('task', $tasks, '', 'class=form-control');
}
/**
@@ -1618,7 +1626,7 @@ class task extends control
public function ajaxGetExecutionTasks($executionID, $taskID = 0)
{
$tasks = $this->task->getExecutionTaskPairs((int)$executionID);
die(html::select('task', empty($tasks) ? array('' => '') : $tasks, $taskID, "class='form-control'"));
echo html::select('task', empty($tasks) ? array('' => '') : $tasks, $taskID, "class='form-control'");
}
/**
@@ -1959,6 +1967,6 @@ class task extends control
$stage = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($task->story)->andWhere('version')->eq($task->storyVersion)->fetch('stage');
$task->storyStage = zget($this->lang->story->stageList, $stage);
}
die(json_encode($task));
echo json_encode($task);
}
}
module/task/lang/zh-cn.php
+1 -1
View File
@@ -40,6 +40,7 @@ $lang->task->cancel = "取消";
$lang->task->cancelAction = "取消任务";
$lang->task->activateAction = "激活任务";
$lang->task->activate = "激活";
$lang->task->activatedDate = "激活日期";
$lang->task->export = "导出数据";
$lang->task->exportAction = "导出任务";
$lang->task->reportChart = "报表统计";
@@ -110,7 +111,6 @@ $lang->task->assignedDate = '指派日期';
$lang->task->openedBy = '由谁创建';
$lang->task->openedDate = '创建日期';
$lang->task->openedDateAB = '创建';
$lang->task->activatedDate = '激活日期';
$lang->task->finishedBy = '由谁完成';
$lang->task->finishedByAB = '完成者';
$lang->task->finishedDate = '实际完成';
module/task/model.php
+30 -11
View File
@@ -64,7 +64,7 @@ class taskModel extends model
->cleanINT('execution,story,module')
->stripTags($this->config->task->editor->create['id'], $this->config->allowedTags)
->join('mailto', ',')
->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate,sync')
->remove('after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate,sync,otherLane,region')
->add('version', 1)
->get();
@@ -247,6 +247,13 @@ class taskModel extends model
$preStory = 0;
$tasks = fixer::input('post')->get();
if($this->config->vision == 'lite')
{
$lanes = $tasks->lane;
$columns = $tasks->column;
unset($tasks->lane);
unset($tasks->column);
}
$extra = str_replace(array(',', ' '), array('&', ''), $extra);
parse_str($extra, $output);
@@ -319,6 +326,7 @@ class taskModel extends model
$data[$i]->openedBy = $this->app->user->account;
$data[$i]->openedDate = $now;
$data[$i]->parent = $tasks->parent[$i];
$data[$i]->vision = isset($tasks->vision[$i]) ? $tasks->vision[$i] : 'common';
if($story) $data[$i]->storyVersion = $this->loadModel('story')->getVersion($data[$i]->story);
if($assignedTo) $data[$i]->assignedDate = $now;
if(strpos($this->config->task->create->requiredFields, 'estStarted') !== false and empty($estStarted)) $data[$i]->estStarted = '';
@@ -404,7 +412,14 @@ class taskModel extends model
$this->executeHooks($taskID);
if(isset($output['laneID']) and isset($output['columnID'])) $this->kanban->addKanbanCell($executionID, $output['laneID'], $output['columnID'], 'task', $taskID);
if($this->config->vision == 'lite')
{
$this->kanban->addKanbanCell($executionID, $lanes[$i], $columns[$i], 'task', $taskID);
}
else
{
if(isset($output['laneID']) and isset($output['columnID'])) $this->kanban->addKanbanCell($executionID, $output['laneID'], $output['columnID'], 'task', $taskID);
}
$actionID = $this->action->create('task', $taskID, 'Opened', '');
if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID);
@@ -458,7 +473,7 @@ class taskModel extends model
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
}
if(!isset($output['laneID']) or !isset($output['columnID'])) $this->kanban->updateLane($executionID, 'task');
if(!isset($output['laneID']) or !isset($output['columnID']) or !isset($lanes)) $this->kanban->updateLane($executionID, 'task');
return $mails;
}
@@ -851,7 +866,7 @@ class taskModel extends model
{
$taskConsumed = 0;
$taskConsumed = $this->dao->select('consumed')->from(TABLE_TASK)->where('id')->eq($this->post->parent)->andWhere('parent')->eq(0)->fetch('consumed');
if($taskConsumed > 0) die(js::error($this->lang->task->error->alreadyConsumed));
if($taskConsumed > 0) return print(js::error($this->lang->task->error->alreadyConsumed));
}
$now = helper::now();
@@ -900,7 +915,7 @@ class taskModel extends model
->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu')
->get();
if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall));
if($task->consumed < $oldTask->consumed) return print(js::error($this->lang->task->error->consumedSmall));
/* Fix bug#1388, Check children task executionID and moduleID. */
if(isset($task->execution) and $task->execution != $oldTask->execution)
@@ -1151,7 +1166,7 @@ class taskModel extends model
$task->{$extendField->field} = htmlSpecialString($task->{$extendField->field});
$message = $this->checkFlowRule($extendField, $task->{$extendField->field});
if($message) die(js::alert($message));
if($message) return print(js::alert($message));
}
if($data->consumeds[$taskID])
@@ -1230,9 +1245,9 @@ class taskModel extends model
/* Check field not empty. */
foreach($tasks as $taskID => $task)
{
if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
if($task->status == 'done' and $task->consumed == false) return print(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
if($task->status == 'cancel') continue;
if(!empty($task->deadline) and $task->estStarted > $task->deadline) die(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall));
if(!empty($task->deadline) and $task->estStarted > $task->deadline) return print(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall));
foreach(explode(',', $this->config->task->edit->requiredFields) as $field)
{
$field = trim($field);
@@ -1300,7 +1315,7 @@ class taskModel extends model
}
else
{
die(js::error('task#' . $taskID . dao::getError(true)));
return print(js::error('task#' . $taskID . dao::getError(true)));
}
}
if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchEdit');
@@ -1518,8 +1533,8 @@ class taskModel extends model
if(!empty($record->work[$id]) or !empty($record->consumed[$id]))
{
if(!$record->consumed[$id]) die(js::alert($this->lang->task->error->consumedThisTime));
if($record->left[$id] === '') die(js::alert($this->lang->task->error->left));
if(!$record->consumed[$id]) return print(js::alert($this->lang->task->error->consumedThisTime));
if($record->left[$id] === '') return print(js::alert($this->lang->task->error->left));
$estimates[$id] = new stdclass();
$estimates[$id]->date = $record->dates[$id];
@@ -1905,6 +1920,7 @@ class taskModel extends model
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', helper::now())
->setDefault('assignedDate', helper::now())
->setDefault('activatedDate', helper::now())
->remove('comment')
->get();
@@ -2196,6 +2212,7 @@ class taskModel extends model
->where('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->andWhere('t4.deleted')->eq(0)
->beginIF($this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi()
->beginIF($projectID)->andWhere('t1.project')->eq($projectID)->fi()
->beginIF($type == 'finishedBy')
@@ -2243,6 +2260,7 @@ class taskModel extends model
->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.execution = t2.id')
->where('t1.assignedTo')->eq($account)
->andWhere('t1.deleted')->eq(0)
->beginIF($this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi()
->beginIF(!empty($skipExecutionIDList))->andWhere('t1.execution')->notin($skipExecutionIDList)->fi()
->query();
@@ -2273,6 +2291,7 @@ class taskModel extends model
->orWhere('t3.status')->eq('suspended')
->markRight(1)
->andWhere('t1.deleted')->eq(0)
->beginIF($this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
->andWhere('t2.deleted')->eq(0)
->beginIF($this->config->systemMode == 'new')->andWhere('t3.deleted')->eq(0)->fi()
->fetchAll('id');
module/task/view/create.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
?>
<form class='main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
<table class='table table-form'>
<?php if($execution->type != 'kanban'):?>
<?php if($execution->type != 'kanban' or $this->config->vision == 'lite'):?>
<tr>
<th><?php echo $lang->task->execution;?></th>
<td><?php echo html::select('execution', $executions, $execution->id, "class='form-control chosen' onchange='loadAll(this.value)' required");?></td><td></td><td></td>
module/task/view/view.html.php
+5 -1
View File
@@ -209,8 +209,12 @@
<table class="table table-data">
<tbody>
<tr>
<?php
$method = 'view';
if($this->config->vision == 'lite') $method = 'kanban';
?>
<th class='w-90px'><?php echo $lang->task->execution;?></th>
<td><?php if(!common::printLink('execution', 'view', "executionID=$task->execution", $execution->name)) echo $execution->name;?></td>
<td><?php if(!common::printLink('execution', $method, "executionID=$task->execution", $execution->name)) echo $execution->name;?></td>
</tr>
<tr>
<th><?php echo $lang->task->module;?></th>