diff --git a/module/bug/model.php b/module/bug/model.php
index 695429219a..e288eafde6 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -76,7 +76,7 @@ class bugModel extends model
->trim('title')
->join('openedBuild', ',')
->join('mailto', ',')
- ->remove('files,labels,uid,oldTaskID,contactListMenu,column,region,lane')
+ ->remove('files,labels,uid,oldTaskID,contactListMenu,region,lane')
->get();
if($bug->execution != 0) $bug->project = $this->dao->select('parent')->from(TABLE_EXECUTION)->where('id')->eq($bug->execution)->fetch('parent');
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index e0405bdb9f..26adb7d749 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -200,11 +200,11 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
| kanbancard->region;?> |
- |
-
+ | |
+
|
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 3f78e41151..0b6d3d21e2 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -332,6 +332,7 @@ $lang->kanbancard->name = 'Card Name';
$lang->kanbancard->legendBasicInfo = 'Basic Info';
$lang->kanbancard->legendLifeTime = 'Card Life';
$lang->kanbancard->space = 'Space';
+$lang->kanbancard->region = 'Region';
$lang->kanbancard->kanban = 'Kanban';
$lang->kanbancard->lane = 'Lane';
$lang->kanbancard->column = 'Column';
diff --git a/module/kanban/lang/zh-tw.php b/module/kanban/lang/zh-tw.php
index 40bb7c1894..9c02d10cf3 100644
--- a/module/kanban/lang/zh-tw.php
+++ b/module/kanban/lang/zh-tw.php
@@ -266,6 +266,7 @@ $lang->kanbancard->name = '卡片名稱';
$lang->kanbancard->legendBasicInfo = '基本信息';
$lang->kanbancard->legendLifeTime = '卡片的一生';
$lang->kanbancard->space = '所屬空間';
+$lang->kanbancard->region = '所屬區域';
$lang->kanbancard->kanban = '所屬看板';
$lang->kanbancard->lane = '所屬泳道';
$lang->kanbancard->column = '所屬看板列';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 943665835d..c71706aae2 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1083,27 +1083,6 @@ class kanbanModel extends model
return $cardGroup;
}
- /**
- * Get object card positions.
- *
- * @param int $kanbanID
- * @param string $laneType
- * @param string $columnType
- * @access public
- * @return array
- */
- public function getCardPositions($kanbanID, $laneType, $columnType)
- {
- return $this->dao->select('t1.name as name, t2.id as laneID, t2.name as laneName, t3.id as columnID')
- ->from(TABLE_KANBANREGION)->alias('t1')
- ->leftjoin(TABLE_KANBANLANE)->alias('t2')->on('t1.id=t2.region')
- ->leftjoin(TABLE_KANBANCOLUMN)->alias('t3')->on('t1.id=t3.region')
- ->where('kanban')->eq($kanbanID)
- ->andWhere('t2.type')->eq($laneType)
- ->andWhere('t3.type')->eq($columnType)
- ->fetchAll('laneID');
- }
-
/**
* Get imported cards.
*
diff --git a/module/story/control.php b/module/story/control.php
index ec05980e4f..49b18504d0 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2144,14 +2144,6 @@ class story extends control
echo json_encode($result);
}
- public function ajaxGetLanesByRegionID($regionID)
- {
- $this->loadModel('kanban');
- $lanePairs = $this->kanban->getLanePairsByRegion($regionID, 'story');
-
- return print(html::select('lane', $lanePairs, '', "class='form-control chosen'"));
- }
-
/**
* AJAX: get spec and verify of a story. for web app.
*
diff --git a/module/story/model.php b/module/story/model.php
index 0e3eadc86b..bd9271769f 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -217,7 +217,7 @@ class storyModel extends model
->setIF($bugID > 0, 'fromBug', $bugID)
->join('mailto', ',')
->stripTags($this->config->story->editor->create['id'], $this->config->allowedTags)
- ->remove('files,labels,reviewer,needNotReview,newStory,uid,contactListMenu,URS,column,region,lane')
+ ->remove('files,labels,reviewer,needNotReview,newStory,uid,contactListMenu,URS,region,lane')
->get();
/* Check repeat story. */
diff --git a/module/task/control.php b/module/task/control.php
index da5e3954fe..b1c4590bfb 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -94,11 +94,10 @@ class task extends control
$lanePairs = $this->kanban->getLanePairsByRegion($regionID, 'task');
$laneID = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
- $this->view->executionType = $execution->type;
- $this->view->regionID = $regionID;
- $this->view->laneID = $laneID;
- $this->view->regionPairs = $regionPairs;
- $this->view->lanePairs = $lanePairs;
+ $this->view->regionID = $regionID;
+ $this->view->laneID = $laneID;
+ $this->view->regionPairs = $regionPairs;
+ $this->view->lanePairs = $lanePairs;
}
/* Set menu. */
diff --git a/module/task/js/create.js b/module/task/js/create.js
index a57b05ef15..e7a60e0b18 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -279,7 +279,6 @@ function loadModuleRelated()
*/
function setLane(regionID)
{
- console.log(regionID);
laneLink = createLink('kanban', 'ajaxGetLanes', 'regionID=' + regionID + '&type=task&field=lane');
$.get(laneLink, function(lane)
{
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index b9e19c65dd..b65ccf9eb6 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -139,7 +139,7 @@
-
+ type == 'kanban'):?>
| kanbancard->region;?> |
|