diff --git a/module/custom/lang/zh-tw.php b/module/custom/lang/zh-tw.php
index 0ae6830535..463dde53ca 100644
--- a/module/custom/lang/zh-tw.php
+++ b/module/custom/lang/zh-tw.php
@@ -83,17 +83,21 @@ $lang->custom->allLang = '適用所有語言';
$lang->custom->confirmRestore = '是否要恢復預設配置?';
$lang->custom->notice = new stdclass();
-$lang->custom->notice->userRole = '鍵的長度必須小於10個字元!';
-$lang->custom->notice->canNotAdd = '該項參與運算,不提供自定義添加功能';
-$lang->custom->notice->forceReview = "指定人提交的%s必須評審。";
-$lang->custom->notice->forceNotReview = "指定人提交的%s不需要評審。";
-$lang->custom->notice->longlife = 'Bug列表頁面的久未處理標籤中,列出設置天數之前未處理的Bug。';
-$lang->custom->notice->priListKey = '優先順序的鍵應當為數字!';
-$lang->custom->notice->keyList = '鍵值應當為小寫英文字母、數字或下劃線的組合';
-$lang->custom->notice->severityListKey = 'Bug嚴重程度的鍵應當為數字!';
-$lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖,是否預設進入產品主頁?";
-$lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖,是否預設進入項目主頁?";
-$lang->custom->notice->indexPage['qa'] = "從8.2版本起增加了測試主頁視圖,是否預設進入測試主頁?";
+$lang->custom->notice->canNotAdd = '該項參與運算,不提供自定義添加功能';
+$lang->custom->notice->forceReview = "指定人提交的%s必須評審。";
+$lang->custom->notice->forceNotReview = "指定人提交的%s不需要評審。";
+$lang->custom->notice->longlife = 'Bug列表頁面的久未處理標籤中,列出設置天數之前未處理的Bug。';
+$lang->custom->notice->invalidNumberKey = '鍵值應為不大於255的數字';
+$lang->custom->notice->invalidStringKey = '鍵值應當為小寫英文字母、數字或下劃線的組合';
+
+$lang->custom->notice->indexPage['product'] = "從8.2版本起增加了產品主頁視圖,是否預設進入產品主頁?";
+$lang->custom->notice->indexPage['project'] = "從8.2版本起增加了項目主頁視圖,是否預設進入項目主頁?";
+$lang->custom->notice->indexPage['qa'] = "從8.2版本起增加了測試主頁視圖,是否預設進入測試主頁?";
+
+$lang->custom->notice->invalidStrlen['ten'] = '鍵的長度必須小於10個字元!';
+$lang->custom->notice->invalidStrlen['twenty'] = '鍵的長度必須小於20個字元!';
+$lang->custom->notice->invalidStrlen['thirty'] = '鍵的長度必須小於30個字元!';
+$lang->custom->notice->invalidStrlen['twoHundred'] = '鍵的長度必須小於225個字元!';
$lang->custom->storyReview = '評審流程';
$lang->custom->forceReview = '強制評審';
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index c336e7b530..d35b2c5946 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -74,7 +74,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Latest Version';
$lang->misc->feature->detailed = 'Details';
-$lang->misc->releaseDate['9.8.stable'] = '2017-01-17';
+$lang->misc->releaseDate['9.8.stable'] = '2018-01-17';
$lang->misc->releaseDate['9.7.stable'] = '2017-12-22';
$lang->misc->releaseDate['9.6.stable'] = '2017-11-06';
$lang->misc->releaseDate['9.5.1'] = '2017-09-27';
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index f82a102473..c4ff6509f7 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -74,7 +74,7 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '详情';
-$lang->misc->releaseDate['9.8.stable'] = '2017-01-17';
+$lang->misc->releaseDate['9.8.stable'] = '2018-01-17';
$lang->misc->releaseDate['9.7.stable'] = '2017-12-22';
$lang->misc->releaseDate['9.6.stable'] = '2017-11-06';
$lang->misc->releaseDate['9.5.1'] = '2017-09-27';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 1db1ccba00..12d390ceb8 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -59,7 +59,6 @@ $lang->productplan->endList[62] = '2 Months';
$lang->productplan->endList[93] = '3 Months';
$lang->productplan->endList[186] = '6 Months';
$lang->productplan->endList[365] = '1 Year';
-$lang->productplan->endList[9999] = 'Future';
$lang->productplan->errorNoTitle = 'ID %s title should not be empty.';
$lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.';
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index 71511ea2d0..2bbaf9cec4 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -52,14 +52,13 @@ $lang->productplan->bugs = 'Bug數';
$lang->productplan->hour = '工時';
$lang->productplan->project = $lang->projectCommon;
-$lang->productplan->endList[7] = '一星期';
-$lang->productplan->endList[14] = '兩星期';
-$lang->productplan->endList[31] = '一個月';
-$lang->productplan->endList[62] = '兩個月';
-$lang->productplan->endList[93] = '三個月';
-$lang->productplan->endList[186] = '半年';
-$lang->productplan->endList[365] = '一年';
-$lang->productplan->endList[9999] = '待定';
+$lang->productplan->endList[7] = '一星期';
+$lang->productplan->endList[14] = '兩星期';
+$lang->productplan->endList[31] = '一個月';
+$lang->productplan->endList[62] = '兩個月';
+$lang->productplan->endList[93] = '三個月';
+$lang->productplan->endList[186] = '半年';
+$lang->productplan->endList[365] = '一年';
$lang->productplan->errorNoTitle = 'ID %s 標題不能為空';
$lang->productplan->errorNoBegin = 'ID %s 開始時間不能為空';
diff --git a/module/task/control.php b/module/task/control.php
index c55055c2b1..bccc9fbc40 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -193,7 +193,7 @@ class task extends control
* @access public
* @return void
*/
- public function batchCreate($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $iframe = 0, $isChildren = false)
+ public function batchCreate($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $iframe = 0)
{
$project = $this->project->getById($projectID);
$taskLink = $this->createLink('project', 'browse', "projectID=$projectID&tab=task");
@@ -225,7 +225,7 @@ class task extends control
$position[] = $this->lang->task->common;
$position[] = $this->lang->task->batchCreate;
- if($isChildren) $this->view->parentTitle = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('name');
+ if($taskID) $this->view->parentTitle = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('name');
$this->view->title = $title;
$this->view->position = $position;
@@ -233,7 +233,6 @@ class task extends control
$this->view->stories = $stories;
$this->view->modules = $modules;
$this->view->parent = $taskID;
- $this->view->isChildren = $isChildren;
$this->view->storyID = $storyID;
$this->view->story = $this->story->getByID($storyID);
$this->view->storyTasks = $this->task->getStoryTaskCounts(array_keys($stories), $projectID);
diff --git a/module/task/model.php b/module/task/model.php
index 7408186f43..599968ddae 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2288,7 +2288,7 @@ class taskModel extends model
common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list');
if(empty($task->team) or empty($task->children))
{
- common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0&isChildren=1", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
+ common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
}
break;
}
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 2f85283b83..a372edbb1e 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -17,7 +17,7 @@
icons['task']);?>
icons['batchCreate']);?>
-
+
task->batchCreateChildren;?>
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index f4f85e542e..0ead607e4c 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -2241,7 +2241,7 @@ class upgradeModel extends model
*/
public function resetProductLine()
{
- $deletedLines = $this->dao->select('id')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('deleted')->eq('1')->fetchPairs();
+ $deletedLines = $this->dao->select('id')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('deleted')->eq('1')->fetchPairs('id', 'id');
$this->dao->update(TABLE_PRODUCT)->set('line')->eq(0)->where('line')->in($deletedLines)->exec();
return !dao::isError();
}