* Modify review code.

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');

module/bug/view/create.html.php

@@ -200,11 +200,11 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
           <?php if(isset($executionType) and $executionType == 'kanban'):?>
           <tr>
             <th><?php echo $lang->kanbancard->region;?></th>
-            <td colspan="1"><?php echo html::select('region', $regionPairs, $regionID, "onchange='setLane(this.value)' class='form-control chosen'");?></td>
-            <td colspan='1'>
+            <td><?php echo html::select('region', $regionPairs, $regionID, "onchange='setLane(this.value)' class='form-control chosen'");?></td>
+            <td>
               <div class='input-group'>
                 <div class="input-group-addon"><?php echo $lang->kanbancard->lane;?></div>
-                <?php echo html::select('lane', $lanePairs, $laneID, "class='form control chosen'");?>
+                <?php echo html::select('lane', $lanePairs, $laneID, "class='form-control chosen'");?>
               </div>
             </td>
           </tr>

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';

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          = '所屬看板列';

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.
      *

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.
      *

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. */

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. */

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)
     {

module/task/view/create.html.php

@@ -139,7 +139,7 @@
           </td>
         </tr>
         <?php endif;?>
-        <?php if(isset($executionType) and $executionType == 'kanban'):?>
+        <?php if($execution->type == 'kanban'):?>
         <tr>
           <th><?php echo $lang->kanbancard->region;?></th>
           <td colspan='3'>