diff --git a/extension/lite/task/ext/control/create.php b/extension/lite/task/ext/control/create.php index 3565608eb4..ae73290144 100644 --- a/extension/lite/task/ext/control/create.php +++ b/extension/lite/task/ext/control/create.php @@ -11,6 +11,38 @@ class myTask extends task die(js::locate(helper::createLink('execution', 'create'))); } + $regionList = $this->loadModel('kanban')->getRegionPairs($executionID, 0, 'execution'); + + $this->view->regionList = $regionList; + $this->view->laneList = array(); + $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']; + $laneID = $_POST['otherLane']; + $columnID = $this->dao->select("t1.id")->from(TABLE_KANBANCOLUMN)->alias('t1') + ->leftJoin(TABLE_KANBANLANE)->alias('t2') + ->on("t2.group = t1.group") + ->where('t1.deleted')->eq('0') + ->andWhere('t2.id')->eq($laneID) + ->andWhere('t1.type')->eq('wait') + ->fetch('id'); + + $extra = "laneID=$laneID,columnID=$columnID"; + } return parent::create($executionID, $storyID, $moduleID, $taskID, $todoID, $extra); } } diff --git a/extension/lite/task/ext/lang/zh-cn/lite.php b/extension/lite/task/ext/lang/zh-cn/lite.php index aee0d15ed5..f64aabc677 100644 --- a/extension/lite/task/ext/lang/zh-cn/lite.php +++ b/extension/lite/task/ext/lang/zh-cn/lite.php @@ -25,6 +25,8 @@ $lang->task->activateAction = "激活任务"; $lang->task->exportAction = "导出任务"; $lang->task->copy = '复制任务'; $lang->task->waitTask = '未开始的任务'; +$lang->task->region = '所属区域'; +$lang->task->lane = '所属泳道'; $lang->task->module = '所属目录'; $lang->task->common = '任务'; diff --git a/extension/lite/task/ext/view/create.html.php b/extension/lite/task/ext/view/create.html.php new file mode 100644 index 0000000000..9ef19f6d53 --- /dev/null +++ b/extension/lite/task/ext/view/create.html.php @@ -0,0 +1,354 @@ + + * @package task + * @version $Id: create.html.php 5090 2013-07-10 05:49:24Z zhujinyonging@gmail.com $ + * @link http://www.zentao.net + */ +?> +app->getModuleRoot() . '/common/view/header.html.php';?> +app->getModuleRoot() . '/common/view/kindeditor.html.php';?> +app->getModuleRoot() . '/common/view/sortable.html.php';?> +id));?> + + + + +
| ''), 0, "class='form-control chosen'");?> | +task->priList, '', "class='form-control chosen'");?> | +
+
+ task->estStarted}'");?>
+ ~
+ task->deadline}'");?>
+
+ |
+ ''), '', "class='form-control chosen'");?> | ++ |
+
+
+
+
+ |
+