diff --git a/extension/lite/action/ext/lang/en/lite.php b/extension/lite/action/ext/lang/en/lite.php index 64f9fa48b4..fb0fcbad1b 100644 --- a/extension/lite/action/ext/lang/en/lite.php +++ b/extension/lite/action/ext/lang/en/lite.php @@ -114,3 +114,5 @@ $lang->action->desc->unlinkchildrenstory = '$date, $actor Unlin $lang->action->desc->linkparentstory = '$date, $actor Link from parent story $extra。' . "\n"; $lang->action->desc->unlinkparentstory = '$date, $actor From parent story$extraCanceledLink。' . "\n"; $lang->action->desc->deletechildrenstory = '$date, $actor Deleted child story$extra。' . "\n"; + +$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first'; diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php index 004f27e1a1..7c12ffc960 100644 --- a/extension/lite/action/ext/lang/zh-cn/lite.php +++ b/extension/lite/action/ext/lang/zh-cn/lite.php @@ -114,3 +114,5 @@ $lang->action->desc->unlinkchildrenstory = '$date, 由 $actor $lang->action->desc->linkparentstory = '$date, 由 $actor 关联到父目标 $extra。' . "\n"; $lang->action->desc->unlinkparentstory = '$date, 由 $actor 从父目标$extra取消关联。' . "\n"; $lang->action->desc->deletechildrenstory = '$date, 由 $actor 删除子目标$extra。' . "\n"; + +$lang->action->executionNoProject = '该项目看板没有所属的项目，请先还原项目再还原项目看板'; diff --git a/extension/lite/task/ext/control/create.php b/extension/lite/task/ext/control/create.php index 8882c08e05..8d9851c465 100644 --- a/extension/lite/task/ext/control/create.php +++ b/extension/lite/task/ext/control/create.php @@ -10,8 +10,9 @@ class myTask extends task echo(js::alert($this->lang->task->kanbanDenied)); die(js::locate(helper::createLink('execution', 'create'))); } - - $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution'); + + $executionID = $this->execution->saveState($executionID, $executions); + $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution'); /* Filter Kanban without Lane. */ $lanes = $this->kanban->getLaneGroupByRegion(array_keys($regionList), 'task'); @@ -20,22 +21,22 @@ class myTask extends task if(!isset($lanes[$key])) unset($regionList[$key]); } + $laneList = array(); + $regionID = key($lanes); + if($regionID) $laneList = $this->kanban->getLanePairsByRegion($regionID, 'task'); + $this->view->regionList = $regionList; - $this->view->laneList = array(); + $this->view->laneList = $laneList; $this->view->extra = $extra; $extra = str_replace(array(',', ' '), array('&', ''), $extra); parse_str($extra, $output); - $lanes = array(); if(isset($output['laneID'])) { $regionID = $this->dao->select("*")->from(TABLE_KANBANLANE)->where('id')->eq($output['laneID'])->fetch('region'); - $lanes = $this->kanban->getLanePairsByRegion($regionID, 'task'); $this->view->regionID = $regionID; } - $this->view->lanes = $lanes; - if(isset($_POST['region'])) { $regionID = $_POST['region']; diff --git a/extension/lite/task/ext/view/create.html.php b/extension/lite/task/ext/view/create.html.php index 82727f8ed7..cecb529b04 100644 --- a/extension/lite/task/ext/view/create.html.php +++ b/extension/lite/task/ext/view/create.html.php @@ -41,17 +41,17 @@ type != 'kanban' or $this->config->vision == 'lite'):?> task->execution;?> - id, "class='form-control chosen' onchange='loadAll(this.value)' required");?> + id, "class='form-control chosen' onchange='loadPage(this.value)' required");?> - 1 or count($lanes) > 1 or empty($extra)):?> + 1 or count($laneList) > 1 or empty($extra)):?> task->region;?> task->lane;?> - + @@ -374,5 +374,11 @@ function loadLaneGroup(regionID) } }) } + +function loadPage(executionID) +{ + var link = createLink('task', 'create', 'executionID=' + executionID); + window.location.replace(link) +} app->getModuleRoot() . '/common/view/footer.html.php';?> diff --git a/extension/lite/todo/ext/view/calendar.html.php b/extension/lite/todo/ext/view/calendar.html.php index 1376e469df..389bb7b423 100644 --- a/extension/lite/todo/ext/view/calendar.html.php +++ b/extension/lite/todo/ext/view/calendar.html.php @@ -61,7 +61,6 @@ $todos = $this->dao->select('id,account,date,name,status,assignedTo')->from(TABLE_TODO) ->where('status')->in('wait,doing') ->andWhere('type')->ne('cycle') - ->andWhere('date')->ne(date('Y-m-d')) ->andWhere('assignedTo')->eq($this->app->user->account) ->andWhere('vision')->eq($this->config->vision) ->fetchAll(); diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index a65872cfe6..2e15e042a6 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -1,3 +1,4 @@ +.table-footer {z-index: 1;} .closed, .closed a {color: gray; text-decoration:line-through;} .resolved, .resolved a {color: #8EC21F; text-decoration: none;} .tree .closed, .tree .closed a {color: #003366; text-decoration: none;} diff --git a/module/group/model.php b/module/group/model.php index 2d8bc6759c..1300a3e9ce 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -158,6 +158,7 @@ class groupModel extends model ->on('t1.`group` = t2.id') ->where('t1.account')->eq($account) ->andWhere('t2.project')->eq(0) + ->andWhere('t2.vision')->eq($this->config->vision) ->fetchAll('id'); } @@ -174,6 +175,7 @@ class groupModel extends model ->leftJoin(TABLE_GROUP)->alias('t2') ->on('t1.`group` = t2.id') ->where('t1.account')->in($accounts) + ->andWhere('t2.vision')->eq($this->config->vision) ->fetchGroup('account'); } diff --git a/module/my/control.php b/module/my/control.php index 5f88323431..0723ca3b6f 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -251,7 +251,7 @@ EOF; /* Load pager. */ $this->app->loadClass('pager', $static = true); if($this->app->getViewType() == 'mhtml') $recPerPage = 10; - $pager = pager::init($recTotal, $recPerPage, $pageID); + $pager = new pager($recTotal, $recPerPage, $pageID); if(empty($userID)) $userID = $this->app->user->id; $user = $this->loadModel('user')->getById($userID, 'id'); @@ -271,8 +271,6 @@ EOF; if($todo->type == 'task' and isset($tasks[$todo->idvalue])) unset($todos[$key]); } - $pager->recTotal = count($todos); - /* Assign. */ $this->view->todos = $todos; $this->view->date = (int)$type == 0 ? date(DT_DATE1) : date(DT_DATE1, strtotime($type)); diff --git a/module/product/css/browse.css b/module/product/css/browse.css index 82fd62caf7..d734351e1d 100644 --- a/module/product/css/browse.css +++ b/module/product/css/browse.css @@ -28,6 +28,7 @@ a.removeModule:hover {color: red;} .table td.has-child > .story-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);} .table td.c-estimate {padding-right: 12px;} .main-table tbody > tr.table-children > td:first-child::before {width: 3px;} +.table-footer {z-index: 1;} @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};} #batchUnlinkStoryTip .modal-body {padding-top: 10px; max-height: 400px; overflow: auto;} diff --git a/module/task/config.php b/module/task/config.php index b7a3c8d326..e79127ec59 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -35,7 +35,7 @@ $config->task->exportFields = ' openedBy, openedDate, assignedTo, assignedDate, finishedBy, finishedDate, canceledBy, canceledDate, closedBy, closedDate, closedReason, - lastEditedBy, lastEditedDate, avtivatedDate, files + lastEditedBy, lastEditedDate, activatedDate, files '; $config->task->customCreateFields = 'story,estStarted,deadline,mailto,pri,estimate'; diff --git a/module/testcase/css/common.css b/module/testcase/css/common.css index 83d7572479..ca9d7c1bad 100644 --- a/module/testcase/css/common.css +++ b/module/testcase/css/common.css @@ -36,3 +36,4 @@ .table-bordered > #steps > tr > td textarea:hover {border-color: #808080;} .table-bordered > #steps > tr > td textarea:focus {border-color: #4d90fe;} .table-bordered > #steps .step-child .step-child-id {border-right: 1px dotted #ddd; border-left: none;} +.table-footer {z-index: 1;}