diff --git a/db/update9.8.1.sql b/db/update9.8.1.sql new file mode 100644 index 0000000000..c78979de99 --- /dev/null +++ b/db/update9.8.1.sql @@ -0,0 +1 @@ +ALTER TABLE `zt_user` CHANGE `realname` `realname` varchar(100) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `password`; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 282c550ee5..c5d6e93df9 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -73,6 +73,7 @@ $lang->tutorial = 'Tutorial'; $lang->changeLog = 'Change Log'; $lang->manual = 'Manual'; $lang->customMenu = 'Custom Menu'; +$lang->lineNumber = 'Line No.'; $lang->tutorialConfirm = 'You are using tutorial. Do you want to exit right now?'; $lang->preShortcutKey = '[Shortcut:←]'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 7fc0082aac..5284d3aaaa 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -73,6 +73,7 @@ $lang->tutorial = '新手教程'; $lang->changeLog = '修改日志'; $lang->manual = '手册'; $lang->customMenu = '自定义导航'; +$lang->lineNumber = '行号'; $lang->tutorialConfirm = '检测到你尚未退出新手教程模式,是否现在退出?'; $lang->preShortcutKey = '[快捷键:←]'; diff --git a/module/task/model.php b/module/task/model.php index ef180ae82b..7a119618e6 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1102,6 +1102,7 @@ class taskModel extends model ->get(); $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec(); + $this->updateParentStatus($oldTask->parent); $this->computeWorkingHours($oldTask->parent); if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story); if(!dao::isError()) return common::createChanges($oldTask, $task); diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index 7549d6c9ac..ae4feecb56 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -9,6 +9,7 @@ + @@ -39,6 +40,7 @@ $case):?> title)) continue;?> + -
lineNumber?> testcase->id?> testcase->title?>
id)) @@ -48,7 +50,7 @@ } else { - echo $addID++ . " {$lang->testcase->new}"; + echo "{$lang->testcase->new}"; } echo html::hidden("product[$key]", $productID); ?> @@ -83,7 +85,7 @@
+