diff --git a/db/update16.4.sql b/db/update16.4.sql index 2f2265fb9c..52133e1dd2 100644 --- a/db/update16.4.sql +++ b/db/update16.4.sql @@ -24,3 +24,6 @@ ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL AFTER `lastEdited ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL AFTER `visits`; UPDATE `zt_user` SET `visions`='rnd,lite'; + +INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES +('lite', '迅捷版用户分组', 'liteUser', '迅捷版用户分组'); diff --git a/extension/lite/block/ext/config/lite.php b/extension/lite/block/ext/config/lite.php deleted file mode 100644 index 60ccd32b16..0000000000 --- a/extension/lite/block/ext/config/lite.php +++ /dev/null @@ -1,2 +0,0 @@ -block->closed = '|html,|contribute'; diff --git a/extension/lite/task/ext/control/batchcreate.php b/extension/lite/task/ext/control/batchcreate.php index 713dc26da6..7444e398de 100644 --- a/extension/lite/task/ext/control/batchcreate.php +++ b/extension/lite/task/ext/control/batchcreate.php @@ -11,7 +11,15 @@ class myTask extends task die(js::locate(helper::createLink('execution', 'create'))); } - $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution'); + $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution'); + $regionIDList = array_keys($regionList); + + /* Filter Kanban without Lane. */ + $lanes = $this->kanban->getLaneGroupByRegion($regionIDList, 'task'); + foreach($regionList as $key => $region) + { + if(!isset($lanes[$key])) unset($regionList[$key]); + } $this->view->regionList = $regionList; $this->view->extra = $extra; diff --git a/extension/lite/task/ext/control/create.php b/extension/lite/task/ext/control/create.php index ae73290144..d6cf3ae80b 100644 --- a/extension/lite/task/ext/control/create.php +++ b/extension/lite/task/ext/control/create.php @@ -11,7 +11,15 @@ class myTask extends task die(js::locate(helper::createLink('execution', 'create'))); } - $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution'); + $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution'); + $regionIDList = array_keys($regionList); + + /* Filter Kanban without Lane. */ + $lanes = $this->kanban->getLaneGroupByRegion($regionIDList, 'task'); + foreach($regionList as $key => $region) + { + if(!isset($lanes[$key])) unset($regionList[$key]); + } $this->view->regionList = $regionList; $this->view->laneList = array(); diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php index 8bf5d597eb..0c007da870 100644 --- a/extension/lite/task/ext/view/batchcreate.html.php +++ b/extension/lite/task/ext/view/batchcreate.html.php @@ -141,7 +141,7 @@