diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 67e1345892..f4da4b6005 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -320,7 +320,7 @@ $lang->execution->menu->task = array('link' => "{$lang->task->common}|execut $lang->execution->menu->kanban = array('link' => "$lang->executionKanban|execution|taskkanban|executionID=%s"); $lang->execution->menu->burn = array('link' => "$lang->burn|execution|burn|executionID=%s"); $lang->execution->menu->view = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation'); -$lang->execution->menu->story = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban'); +$lang->execution->menu->story = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban,batchtotask'); $lang->execution->menu->qa = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport'); $lang->execution->menu->devops = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo'); $lang->execution->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=execution&objectID=%s", 'subModule' => 'doc'); diff --git a/module/execution/js/story.js b/module/execution/js/story.js index a6dcb47577..acf01a4c38 100644 --- a/module/execution/js/story.js +++ b/module/execution/js/story.js @@ -32,7 +32,7 @@ $(function() }) /* Get checked stories. */ - $('#batchToTaskButton').on('click', function() + $(document).on('click', '#batchToTaskButton', function() { storyIdList = ''; linedTaskIdList = ''; @@ -53,6 +53,26 @@ $(function() $('#submit').click(function() { + var taskType = $('#type').val(); + var hourPoint = $('#hourPointValue').val(); + if(taskType.length == 0) + { + alert(typeNotEmpty); + return false; + } + + if(hourPoint == 0) + { + alert(hourPointNotEmpty); + return false; + } + else if(typeof(hourPoint) != 'undefined' && (isNaN(hourPoint) || hourPoint < 0)) + { + alert(hourPointNotError); + return false; + } + hourPoint = typeof(hourPoint) == 'undefined' ? 0 : hourPoint; + if(linedTaskIdList) { confirmStoryToTask = confirmStoryToTask.replace('%s', linedTaskIdList); diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 375cb05ff8..a95209c3b4 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -154,6 +154,7 @@ $lang->execution->putoff = 'Zurückstellen'; $lang->execution->suspend = 'Aussetzen'; $lang->execution->close = 'Schließen'; $lang->execution->export = 'Export'; +$lang->execution->next = "Next"; $lang->execution->endList[7] = '1 Woche'; $lang->execution->endList[14] = '2 Wochen'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 0b0ed597ad..e80c332b2b 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -154,6 +154,7 @@ $lang->execution->putoff = 'Delay'; $lang->execution->suspend = 'Suspend'; $lang->execution->close = 'Close'; $lang->execution->export = 'Export'; +$lang->execution->next = "Next"; $lang->execution->endList[7] = '1 Week'; $lang->execution->endList[14] = '2 Weeks'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index bec2096bbb..f80d87195e 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -154,6 +154,7 @@ $lang->execution->putoff = 'Ajourner'; $lang->execution->suspend = 'Suspendre'; $lang->execution->close = 'Fermer'; $lang->execution->export = 'Exporter'; +$lang->execution->next = "Suivant"; $lang->execution->endList[7] = '1 Semaine'; $lang->execution->endList[14] = '2 Semaines'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 3d7ff4c33a..b36043be69 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -154,6 +154,7 @@ $lang->execution->putoff = "延期"; $lang->execution->suspend = "挂起"; $lang->execution->close = "关闭"; $lang->execution->export = "导出"; +$lang->execution->next = "下一步"; $lang->execution->endList[7] = '一星期'; $lang->execution->endList[14] = '两星期'; diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index 6b69a30834..d38b3d3674 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -18,8 +18,12 @@ cookie->storyProductParam);?> cookie->storyBranchParam));?> id);?> +project);?> execution->confirmUnlinkStory)?> lang->error->notempty, $this->lang->task->type))?> +lang->error->notempty, $this->lang->task->type));?> +lang->error->notempty, $this->lang->story->convertRelations));?> +lang->story->float, $this->lang->story->convertRelations));?> lang->error->notempty, $this->lang->workingHour))?> execution->confirmStoryToTask);?> @@ -318,7 +322,7 @@