diff --git a/api/v1/entries/users.php b/api/v1/entries/users.php index 3e0a5bf543..9696cb0211 100644 --- a/api/v1/entries/users.php +++ b/api/v1/entries/users.php @@ -62,8 +62,8 @@ class usersEntry extends entry $password = $this->request('password', '') ? md5($this->request('password')) : ''; - $visions = $this->request('visions', 'rnd'); - if(is_array($visions)) $visions = implode(',', $visions); + $visions = $this->request('visions', array('rnd')); + if(!is_array($visions)) $visions = explode(',', $visions); $this->setPost('password1', $password); $this->setPost('password2', $password); diff --git a/extension/lite/kanban/ext/model/lite.php b/extension/lite/kanban/ext/model/lite.php index 3406eb1c33..5415abe686 100644 --- a/extension/lite/kanban/ext/model/lite.php +++ b/extension/lite/kanban/ext/model/lite.php @@ -5,6 +5,16 @@ public function __construct($appName = '') if($this->app->getModuleName() == 'kanban') $this->lang->kanban->menu = new stdclass(); } +/** + * Get kanban group by execution id. + * + * @param int $executionID + * @param int $browseType + * @param int $groupBy + * @param string $searchValue + * @access public + * @return array + */ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValue = '') { /* Get card data. */ @@ -85,7 +95,7 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu $columnData[$columnID]['actions'] = $column->actions; $cardOrder = 1; - $objects = zget($cardGroup, $columnID, array()); + $objects = zget($cardGroup, $column->columnType, array()); foreach($objects as $object) { if(empty($object)) continue; @@ -104,10 +114,14 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu if($browseType == 'task') { + if($searchValue != '' and strpos($object->name, $searchValue) === false) continue; $cardData['name'] = $object->name; + $cardData['status'] = $object->status; + $cardData['left'] = $object->left; } else { + if($searchValue != '' and strpos($object->name, $searchValue) === false) continue; $cardData['title'] = $object->title; } @@ -132,6 +146,7 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu * @param int $kanbanID * @param string $browseType all|task|bug|story * @param string $orderBy + * @param string $searchValue * @access public * @return array */ diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php index b9fc5931c4..fc569b5f0d 100644 --- a/extension/lite/project/ext/view/execution.html.php +++ b/extension/lite/project/ext/view/execution.html.php @@ -37,17 +37,17 @@
- cookie->kanbanview) $kanbanview = $this->cookie->kanbanview; - + if(!common::hasPriv('execution', $kanbanview)) { - foreach (explode('|', 'kanban|task|calendar|gantt|tree|grouptask') as $view) + foreach (explode('|', 'kanban|task|calendar|gantt|tree|grouptask') as $view) { if(common::hasPriv('execution', $view)) { - $kanbanview = $view; + $kanbanview = $view; break; } } @@ -93,24 +93,24 @@
- id];?> + id]) ? $memberGroup[$kanban->id] : array();?> - 2) break;?> - + 2) break;?> +
zget($usersAvatar, $member->account), 'account' => $member->account, 'name' => isset($member->realname) ? $member->realname : '')); ?>
4):?> - … ';?> - + … ';?> + 3):?> -
- $usersAvatar[$lastMember->account], 'account' => $lastMember->account, 'name' => $lastMember->realname), 'avatar-circle avatar-' . key($lastMember)); ?> -
- +
+ $usersAvatar[$lastMember->account], 'account' => $lastMember->account, 'name' => $lastMember->realname), 'avatar-circle avatar-' . key($lastMember)); ?> +
+
project->teamSumCount, count($teams));?>
diff --git a/extension/lite/story/ext/view/view.html.php b/extension/lite/story/ext/view/view.html.php index aa8dad0c79..bd48a2e3e3 100644 --- a/extension/lite/story/ext/view/view.html.php +++ b/extension/lite/story/ext/view/view.html.php @@ -153,7 +153,6 @@ common::printIcon('story', 'assignTo', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); - if($this->config->edition == 'max' and $this->app->tab == 'project' and common::hasPriv('story', 'importToLib')) echo html::a('#importToLib', " " . $this->lang->story->importToLib, '', 'class="btn" data-toggle="modal"'); if($from == 'execution' and strpos('draft,closed', $story->status) === false) common::printIcon('task', 'create', "execution=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody'); diff --git a/extension/lite/task/ext/view/create.html.php b/extension/lite/task/ext/view/create.html.php index f63754c67d..4ca65ab4ad 100644 --- a/extension/lite/task/ext/view/create.html.php +++ b/extension/lite/task/ext/view/create.html.php @@ -101,7 +101,7 @@ task->noticeLinkStory, html::a($this->createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=story"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?>
- story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?> + story, "class='form-control chosen' onchange='setStoryRelated();'");?> preview;?>
diff --git a/framework/router.class.php b/framework/router.class.php index 043acbfb2f..8012024df6 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -521,7 +521,7 @@ class router extends baseRouter if($moduleName == 'flow' and $methodName == 'browse') { $mode = 'browse'; - if(count($params) > 0) $mode = array_shift($params); + if(count($params) > 0 and !is_numeric($params[0])) $mode = array_shift($params); array_unshift($params, $mode); } @@ -546,9 +546,13 @@ class router extends baseRouter if($moduleName == 'flow' and $methodName == 'browse') { - $mode = 'browse'; - if(count($params) > 0) $mode = array_pop($params); + $mode = zget($params, 'mode', 'browse'); + if(is_numeric($mode)) $mode = 'browse'; $params['mode'] = $mode; + + $get = array_reverse($_GET); + $get['mode'] = $mode; + $_GET = array_reverse($get); } $params[$this->config->methodVar] = $methodName; // $param = array('id' => 1, 'f' => 'operate'); $params[$this->config->moduleVar] = $moduleName; // $param = array('id' => 1, 'f' => 'operate', 'm' => 'flow'); diff --git a/module/bug/control.php b/module/bug/control.php index 963aa527e2..a15854651d 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -411,10 +411,11 @@ class bug extends control $execution = $this->loadModel('execution')->getByID($executionID); if($executionID == $output['executionID'] and $this->app->tab == 'execution' and $execution->type == 'kanban') { - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)")); } else @@ -709,10 +710,12 @@ class bug extends control $execution = $this->loadModel('execution')->getByID($executionID); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); + return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } else @@ -963,8 +966,9 @@ class bug extends control $execution = $this->loadModel('execution')->getByID($bug->execution); if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { - $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup); - $kanbanData = json_encode($kanbanData); + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } @@ -1288,8 +1292,9 @@ class bug extends control $execution = $this->loadModel('execution')->getByID($bug->execution); if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { - $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup); - $kanbanData = json_encode($kanbanData); + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } @@ -1495,11 +1500,12 @@ class bug extends control $execution = $this->loadModel('execution')->getByID($bug->execution); if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } @@ -1589,11 +1595,12 @@ class bug extends control { if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } @@ -1690,11 +1697,12 @@ class bug extends control $execution = $this->loadModel('execution')->getByID($bug->execution); if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } @@ -1750,11 +1758,12 @@ class bug extends control $execution = $this->loadModel('execution')->getByID($bug->execution); if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index b1cba31e03..8c1957c244 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -61,6 +61,7 @@ $lang->bug->openedDate = 'ReportedDate'; $lang->bug->openedDateAB = 'Reported'; $lang->bug->openedBuild = 'Open Build'; $lang->bug->assignedTo = 'AssignTo'; +$lang->bug->assignedToMe = 'AssignToMe'; $lang->bug->assignBug = 'AssignedTo'; $lang->bug->assignedToAB = 'AssignedTo'; $lang->bug->assignedDate = 'AssignedDate'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index c77c47c11f..52d5277a7c 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -61,6 +61,7 @@ $lang->bug->openedDate = '创建日期'; $lang->bug->openedDateAB = '创建日期'; $lang->bug->openedBuild = '影响版本'; $lang->bug->assignedTo = '指派给'; +$lang->bug->assignedToMe = '指派给我'; $lang->bug->assignBug = '指派给'; $lang->bug->assignedToAB = '指派给'; $lang->bug->assignedDate = '指派日期'; diff --git a/module/bug/model.php b/module/bug/model.php index 1a21378fb3..5e4d93c7cc 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1601,18 +1601,62 @@ class bugModel extends model * @param int $limit * @param object $pager * @param int $executionID + * @param int $queryID * @access public - * @return void + * @return array */ - public function getUserBugs($account, $type = 'assignedTo', $orderBy = 'id_desc', $limit = 0, $pager = null, $executionID = 0) + public function getUserBugs($account, $type = 'assignedTo', $orderBy = 'id_desc', $limit = 0, $pager = null, $executionID = 0, $queryID = 0) { - if(!$this->loadModel('common')->checkField(TABLE_BUG, $type)) return array(); + $moduleName = $this->app->rawMethod == 'work' ? 'workBug' : 'contributeBug'; + $queryName = $moduleName . 'Query'; + $formName = $moduleName . 'Form'; + + $bugIDList = array(); + if($moduleName == 'contributeBug') + { + $bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, 0, $pager, $orderBy, 0, 'bug'); + foreach($bugsAssignedByMe as $bugID => $bug) + { + $bugIDList[$bugID] = $bugID; + } + } + + if($queryID) + { + $query = $this->loadModel('search')->getQuery($queryID); + if($query) + { + $this->session->set($queryName, $query->sql); + $this->session->set($formName, $query->form); + } + else + { + $this->session->set($queryName, ' 1 = 1'); + } + } + else + { + if($this->session->$queryName == false) $this->session->set($queryName, ' 1 = 1'); + } + $query = $this->session->$queryName; + $query = preg_replace('/`(\w+)`/', 't1.`$1`', $query); + + if($type != 'bySearch' and !$this->loadModel('common')->checkField(TABLE_BUG, $type)) return array(); $bugs = $this->dao->select('t1.*,t2.name as productName')->from(TABLE_BUG)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') ->where('t1.deleted')->eq(0) + ->beginIF($type == 'bySearch')->andWhere($query)->fi() ->beginIF($executionID)->andWhere('t1.execution')->eq($executionID)->fi() ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi() - ->beginIF($type != 'all')->andWhere("t1.`$type`")->eq($account)->fi() + ->beginIF($type != 'all' and $type != 'bySearch')->andWhere("t1.`$type`")->eq($account)->fi() + ->beginIF($type == 'bySearch' and $moduleName == 'workBug')->andWhere("t1.assignedTo")->eq($account)->fi() + ->beginIF($type == 'bySearch' and $moduleName == 'contributeBug') + ->andWhere('t1.openedBy', 1)->eq($account) + ->orWhere('t1.closedBy')->eq($account) + ->orWhere('t1.resolvedBy')->eq($account) + ->orWhere('t1.id')->in($bugIDList) + ->markRight(1) + ->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi() ->page($pager) diff --git a/module/execution/config.php b/module/execution/config.php index fb00ff4e8f..6467b32538 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -51,6 +51,7 @@ $config->execution->search['fields']['desc'] = $lang->task->desc; $config->execution->search['fields']['assignedTo'] = $lang->task->assignedTo; $config->execution->search['fields']['pri'] = $lang->task->pri; +if($app->tab == 'my') $config->execution->search['fields']['project'] = $lang->task->project; $config->execution->search['fields']['execution'] = $lang->task->execution; $config->execution->search['fields']['module'] = $lang->task->module; $config->execution->search['fields']['estimate'] = $lang->task->estimate; @@ -86,6 +87,7 @@ $config->execution->search['params']['desc'] = array('operator' => 'in $config->execution->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->execution->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->priList); +if($app->tab == 'my') $config->execution->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->execution->search['params']['execution'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->execution->search['params']['module'] = array('operator' => 'belong', 'control' => 'select', 'values' => ''); $config->execution->search['params']['estimate'] = array('operator' => '=', 'control' => 'input', 'values' => ''); diff --git a/module/execution/control.php b/module/execution/control.php index ac8760f403..771df3a243 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -115,6 +115,7 @@ class execution extends control $this->loadModel('datatable'); $this->loadModel('setting'); $this->loadModel('product'); + $this->loadModel('user'); if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create'), " " . $this->lang->execution->create, '', "class='btn btn-primary'"); @@ -211,6 +212,7 @@ class execution extends control /* team member pairs. */ $memberPairs = array(); foreach($this->view->teamMembers as $key => $member) $memberPairs[$key] = $member->realname; + $memberPairs = $this->user->processAccountSort($memberPairs); $showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : ''; $extra = (isset($this->config->execution->task->allModule) && $this->config->execution->task->allModule == 1) ? 'allModule' : ''; @@ -227,7 +229,7 @@ class execution extends control $this->view->orderBy = $orderBy; $this->view->browseType = $browseType; $this->view->status = $status; - $this->view->users = $this->loadModel('user')->getPairs('noletter|all'); + $this->view->users = $this->user->getPairs('noletter|all'); $this->view->param = $param; $this->view->executionID = $executionID; $this->view->execution = $execution; @@ -458,6 +460,14 @@ class execution extends control if(!empty($_POST)) { $this->execution->importTask($toExecution); + + /* If link from no head then reload. */ + if(isonlybody()) + { + $kanbanData = $this->loadModel('kanban')->getRDKanban($toExecution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); + return print(js::reload('parent')); + } + return print(js::locate(inlink('importTask', "toExecution=$toExecution&fromExecution=$fromExecution"), 'parent')); } @@ -918,6 +928,7 @@ class execution extends control { $memberPairs[$key] = $member->realname; } + $memberPairs = $this->user->processAccountSort($memberPairs); /* Build the search form. */ $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID"); @@ -2121,6 +2132,7 @@ class execution extends control $this->session->set('execLaneType', $browseType); $this->session->set('execGroupBy', $groupBy); $this->session->set('storyList', $this->app->getURI(true), 'execution'); + $this->session->set('rdSearchValue', ''); $this->lang->execution->menu = new stdclass(); $execution = $this->commonAction($executionID); @@ -3831,6 +3843,7 @@ class execution extends control if($lastEditedTime > $enterTime or $groupBy != 'default' or !empty($searchValue)) { + if($from == 'RD') $this->session->set('rdSearchValue', $searchValue); $kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy, $searchValue); return print(json_encode($kanbanGroup)); } diff --git a/module/execution/js/importtask.js b/module/execution/js/importtask.js index 47b2dca33d..f3626b5617 100644 --- a/module/execution/js/importtask.js +++ b/module/execution/js/importtask.js @@ -3,3 +3,21 @@ function reload(toProject, fromProject) link = createLink('execution','importtask','toProject='+toProject + '&fromProject='+fromProject); location.href = link; } + +$(function() +{ + $(".preview").modalTrigger({width:1000, type:'iframe'}); + + if(isonlybody == true) parent.$('#triggerModal .modal-content .modal-header .close').hide(); +}); + +/** + * Go back. + * + * @access public + * @return void + */ +function goback() +{ + parent.location.reload(); +} diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 26ecb547fd..2d9adc0fc9 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -451,12 +451,37 @@ function renderDeadline(deadline, status) now.setMilliseconds(0); var isEarlyThanToday = date.getTime() < now.getTime(); var deadlineDate = $.zui.formatDate(date, 'MM-dd'); - var statusList = ['wait','doing','pause']; + var statusList = ['doing','pause']; var textColor = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted'; return $('').text(deadlineLang + ' ' + deadlineDate).addClass(textColor); } +/** + * Render estStarted + * + * @param {String|Date} estStarted EstStarted + * @param {string} status + * @access public + * @return void + */ +function renderEstStarted(estStarted, status) +{ + if(estStarted == '0000-00-00') return; + + var date = $.zui.createDate(estStarted); + var now = new Date(); + now.setHours(0); + now.setMinutes(0); + now.setSeconds(0); + now.setMilliseconds(0); + var isEarlyThanToday = date.getTime() < now.getTime(); + var estStartedDate = $.zui.formatDate(date, 'MM-dd'); + var textColor = isEarlyThanToday && typeof(status) != 'undefined' && status == 'wait' ? 'text-red' : 'text-muted'; + + return $('').text(estStartedLang + ' ' + estStartedDate).addClass(textColor); +} + /** * Render story item * @param {Object} item Story item object @@ -606,8 +631,7 @@ function renderTaskItem(item, $item, col) var $title = $item.find('.title'); if(!$title.length) { - $title = $('' + (scaleSize <= 1 ? ' ' : '') + '') - .attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true)).attr('data-toggle', 'modal').attr('data-width', '80%'); + $title = $('' + (scaleSize <= 1 ? ' ' : '') + '').attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true)).attr('data-toggle', 'modal').attr('data-width', '80%'); $title.appendTo($item); } var name = rdSearchValue != '' ? "" + item.name.replaceAll(rdSearchValue, "" + rdSearchValue + "") + "": "" + item.name + ""; @@ -623,7 +647,8 @@ function renderTaskItem(item, $item, col) var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); $infos.html([priHtml, hoursHtml].join('')); - if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline, item.status)); + if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause')) $infos.append(renderDeadline(item.deadline, item.status)); + if(item.estStarted && scaleSize <= 1 && item.status == 'wait') $infos.append(renderEstStarted(item.estStarted, item.status)); $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml); if(scaleSize <= 1) $infos.appendTo($item); @@ -740,7 +765,7 @@ function renderHeaderCol($column, column, $header, kanbanData) var printMoreBtn = (columnPrivs.includes('setColumn') || columnPrivs.includes('setWIP')); /* Render more menu. */ - if(column.type == 'backlog' || column.type == 'wait' || column.type == 'unconfirmed' && $actions.children('.text-primary').length == 0) + if((column.type == 'backlog' || column.type == 'wait' || column.type == 'unconfirmed') && $actions.children('.text-primary').length == 0) { var tips = productID ? '' : 'onclick="tips()"'; $actions.append([ @@ -818,7 +843,6 @@ function updateRegion(regionID, regionData = []) if(groupBy == 'default') $("div[data-id^=" + regionID + "].region").show(); if(groupBy != 'default') $("div[data-id^=" + regionID + "].kanban").show(); } - $region.empty(); $region.data('zui.kanban').render(data); resetRegionHeight('open'); return true; @@ -1528,21 +1552,23 @@ $(function() /* Ajax update kanban. */ if(groupBy == 'default') { - var lastUpdateData; setInterval(function() { - $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue' + rdSearchValue), function(data) + if(rdSearchValue == '') { - if(data && lastUpdateData !== data) + $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + rdSearchValue), function(data) { - lastUpdateData = data; - kanbanData = $.parseJSON(data); - for(var region in kanbanData) + if(data && lastUpdateData !== data) { - updateRegion(region, kanbanData[region]); + lastUpdateData = data; + kanbanData = $.parseJSON(data); + for(var region in kanbanData) + { + updateRegion(region, kanbanData[region]); + } } - } - }); + }); + } }, 10000); } @@ -1640,8 +1666,10 @@ function toggleRDSearchBox() function searchCards(value) { rdSearchValue = value; - $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + value), function(data) + $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + rdSearchValue), function(data) { + if(lastUpdateData === data) return; + lastUpdateData = data; var kanbanData = $.parseJSON(data); var hideAll = true; $('#kanban').children('.region').children("div[id^='kanban']").each(function() @@ -1649,6 +1677,9 @@ function searchCards(value) var regionID = $(this).attr('data-id'); if(kanbanData != null) data = groupBy == 'default' ? kanbanData[regionID] : kanbanData[groupBy]; + if(rdSearchValue != '' && data.laneCount != 0) $(this).parent().show(); + if(rdSearchValue != '' && data.laneCount == 0) $(this).parent().hide(); + hideAll = hideAll && !updateRegion(regionID, data); }); diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js index 27da8b0eea..9fb28a4cce 100644 --- a/module/execution/js/taskkanban.js +++ b/module/execution/js/taskkanban.js @@ -67,12 +67,37 @@ function renderDeadline(deadline, status) now.setMilliseconds(0); var isEarlyThanToday = date.getTime() < now.getTime(); var deadlineDate = $.zui.formatDate(date, 'MM-dd'); - var statusList = ['wait','doing','pause']; + var statusList = ['doing','pause']; var textColor = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted'; return $('').text(deadlineLang + ' ' + deadlineDate).addClass(textColor); } +/** + * Render estStarted + * + * @param {String|Date} estStarted EstStarted + * @param {string} status + * @access public + * @return void + */ +function renderEstStarted(estStarted, status) +{ + if(estStarted == '0000-00-00') return; + + var date = $.zui.createDate(estStarted); + var now = new Date(); + now.setHours(0); + now.setMinutes(0); + now.setSeconds(0); + now.setMilliseconds(0); + var isEarlyThanToday = date.getTime() < now.getTime(); + var estStartedDate = $.zui.formatDate(date, 'MM-dd'); + var textColor = isEarlyThanToday && typeof(status) != 'undefined' && status == 'wait' ? 'text-red' : 'text-muted'; + + return $('').text(estStartedLang + ' ' + estStartedDate).addClass(textColor); +} + /** * Render story item * @param {Object} item Story item object @@ -218,8 +243,7 @@ function renderTaskItem(item, $item, col) var $title = $item.find('.title'); if(!$title.length) { - $title = $('' + (scaleSize <= 1 ? ' ' : '') + '') - .attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true)); + $title = $('' + (scaleSize <= 1 ? ' ' : '') + '').attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true)); $title.appendTo($item); } $title.attr('title', item.name).find('.text').text(item.name); @@ -234,7 +258,8 @@ function renderTaskItem(item, $item, col) var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); $infos.html([priHtml, hoursHtml].join('')); - if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline, item.status)); + if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause')) $infos.append(renderDeadline(item.deadline, item.status)); + if(item.estStarted && scaleSize <= 1 && item.status == 'wait') $infos.append(renderEstStarted(item.estStarted, item.status)); $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml); if(scaleSize <= 1) $infos.appendTo($item); diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php index 6224baf7bb..66661458ac 100644 --- a/module/execution/view/importtask.html.php +++ b/module/execution/view/importtask.html.php @@ -11,6 +11,7 @@ */ ?> +
+ rawMethod == 'work' ? 'workBug' : 'contributeBug';?> +
>

bug->noBug;?>

+
>
'> - +
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 16e4e4076a..0d3eb6ea33 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -18,29 +18,38 @@
+rawMethod == 'work' ? 'workTask' : 'contributeTask';?> +
>

task->noTask;?>

+
>
- +
diff --git a/module/product/control.php b/module/product/control.php index 8b4940bae5..2d3a6291a9 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -1201,7 +1201,7 @@ class product extends control * @access public * @return void */ - public function all($browseType = 'noclosed', $orderBy = 'program_asc,order_asc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function all($browseType = 'noclosed', $orderBy = 'program_asc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1) { /* Load module and set session. */ $this->loadModel('program'); diff --git a/module/product/model.php b/module/product/model.php index f20a1b7d27..a97bdbcefb 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -339,19 +339,35 @@ class productModel extends model if(!empty($append) and is_array($append)) $append = implode(',', $append); - $views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append"; - $orderBy = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed'; - $products = $this->dao->select('*, IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed') - ->from(TABLE_PRODUCT) - ->where(1) - ->beginIF(strpos($mode, 'all') === false)->andWhere('deleted')->eq(0)->fi() - ->beginIF($programID)->andWhere('program')->eq($programID)->fi() - ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi() - ->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('id')->in($views)->fi() - ->andWhere('vision')->eq($this->config->vision) - ->orderBy($orderBy) - ->fetchPairs('id', 'name'); - return $products; + $views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append"; + if($this->config->systemMode == 'new') + { + /* Order by program. */ + return $this->dao->select('t1.*, IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed')->from(TABLE_PRODUCT)->alias('t1') + ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id') + ->where(1) + ->beginIF(strpos($mode, 'all') === false)->andWhere('t1.deleted')->eq(0)->fi() + ->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi() + ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t1.status')->ne('closed')->fi() + ->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('t1.id')->in($views)->fi() + ->andWhere('t1.vision')->eq($this->config->vision) + ->orderBy('isClosed, t2.order_asc, t1.line_desc, t1.order_desc') + ->fetchPairs('id', 'name'); + } + else + { + $orderBy = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed'; + return $this->dao->select('*, IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed') + ->from(TABLE_PRODUCT) + ->where(1) + ->beginIF(strpos($mode, 'all') === false)->andWhere('deleted')->eq(0)->fi() + ->beginIF($programID)->andWhere('program')->eq($programID)->fi() + ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi() + ->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('id')->in($views)->fi() + ->andWhere('vision')->eq($this->config->vision) + ->orderBy($orderBy) + ->fetchPairs('id', 'name'); + } } /** diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 4864f75ac9..30c8011570 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -62,6 +62,7 @@ $lang->project->workdaysExceed = 'No more than『%s』working days'; $lang->project->teamMembersCount = ', there are %s team members.'; $lang->project->budgetNumber = '『Budget』must be numbers.'; $lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.'; +$lang->project->allProjects = 'All Projects'; /* Fields. */ $lang->project->common = 'Project'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 23191cf732..0913b1d071 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -62,6 +62,7 @@ $lang->project->workdaysExceed = '可用工作日不能超过『%s』天'; $lang->project->teamMembersCount = '，团队成员共%s人。'; $lang->project->budgetNumber = '『预算』金额必须为数字。'; $lang->project->budgetGe0 = '『预算』金额必须大于等于0。'; +$lang->project->allProjects = '所有项目'; /* Fields. */ $lang->project->common = '项目'; diff --git a/module/story/control.php b/module/story/control.php index 7ab1f7ecf6..74c8505fd9 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -685,8 +685,9 @@ class story extends control $execution = $this->execution->getByID($this->session->execution); if($this->app->tab == 'execution' and $execution->type == 'kanban') { - $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup); - $kanbanData = json_encode($kanbanData); + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } @@ -1057,10 +1058,11 @@ class story extends control $execution = $this->execution->getByID($this->session->execution); if($this->app->tab == 'execution' and $execution->type == 'kanban') { - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } @@ -1363,10 +1365,11 @@ class story extends control if($this->app->tab == 'execution' and $execution->type == 'kanban') { $this->loadModel('kanban')->updateLane($this->session->execution, 'story', $storyID); - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } @@ -1716,9 +1719,10 @@ class story extends control $execution = $this->execution->getByID($this->session->execution); if($this->app->tab == 'execution' and $execution->type == 'kanban') { - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } diff --git a/module/story/model.php b/module/story/model.php index f5bea613da..637b91aad8 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2986,6 +2986,7 @@ class storyModel extends model ->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi() ->beginIF($status == 'unclosed')->andWhere('t2.status')->ne('closed')->fi() ->beginIF($status == 'review')->andWhere('t2.status')->in('draft,changed')->fi() + ->beginIF($status == 'active')->andWhere('t2.status')->eq('active')->fi() ->orderBy('t1.`order` desc, t1.`story` desc') ->fetchAll('id'); return empty($stories) ? array() : $this->formatStories($stories, $type); diff --git a/module/task/control.php b/module/task/control.php index a2c2441628..926ff45c80 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -173,10 +173,11 @@ class task extends control { if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)")); } @@ -240,9 +241,7 @@ class task extends control if(!isset($moduleOptionMenu[$task->module])) $task->module = 0; } - $stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'unclosed'); - - if($this->config->vision == 'lite') $stories = $stories + array('', ''); + $stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'active'); /* Get block id of assinge to me. */ $blockID = 0; @@ -349,10 +348,11 @@ class task extends control { if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, 0)")); } @@ -509,8 +509,9 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup); - $kanbanData = json_encode($kanbanData); + $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); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } @@ -539,7 +540,7 @@ class task extends control $this->view->title = $this->lang->task->edit . 'TASK' . $this->lang->colon . $this->view->task->name; $this->view->position[] = $this->lang->task->common; $this->view->position[] = $this->lang->task->edit; - $this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id); + $this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active'); $this->view->tasks = $tasks; $this->view->users = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}"); $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : ''; @@ -729,8 +730,9 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup); - $kanbanData = json_encode($kanbanData); + $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); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)")); } @@ -977,11 +979,12 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } @@ -1041,10 +1044,11 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $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)")); } @@ -1177,11 +1181,12 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } @@ -1267,11 +1272,12 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } @@ -1325,10 +1331,11 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $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)")); } @@ -1398,11 +1405,12 @@ class task extends control if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } @@ -1563,11 +1571,12 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } @@ -1621,11 +1630,12 @@ class task extends control $execution = $this->execution->getByID($task->execution); if($execution->type == 'kanban' and $this->app->tab == 'execution') { - $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); + $regionID = !empty($output['regionID']) ? $output['regionID'] : 0; + $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; + $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; + $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : ''; + $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue); + $kanbanData = json_encode($kanbanData); return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)")); } diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 88814d0cce..06ddc2a7f5 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -161,7 +161,7 @@ $lang->task->recordEstimateAction = '添加工时'; $lang->task->ditto = '同上'; $lang->task->dittoNotice = "该任务与上一任务不属于同一%s！"; -$lang->task->selectTestStory = "选择测试需求"; +$lang->task->selectTestStory = "选择测试{$lang->SRCommon}"; $lang->task->selectAllUser = '全部'; $lang->task->noStory = "无{$lang->SRCommon}"; $lang->task->noAssigned = '未指派'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 574ea6d48a..fd78a62ad3 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -652,6 +652,9 @@ class upgradeModel extends model case 'biz7.0.beta1': $this->processViewFields(); break; + case 'biz7.0': + $this->processFlowPosition(); + break; } } diff --git a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php index 6666cd2421..32599f2ce7 100644 --- a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php @@ -3,7 +3,7 @@ $lang->message->typeList['xuanxuan'] = '聊天'; $lang->message->sender = '禅道项目管理'; -$lang->message->notifyTitle = '%s 给您%s%d个%s'; +$lang->message->notifyTitle = '%s %s%d个%s'; $lang->message->mr = new stdClass(); $lang->message->mr->logTitle = '构建日志';