diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 7a487b05d7..9a60c6d85b 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -3,7 +3,7 @@ $(function() $('#products').change(function() { var selectProductID = $('#products').val(); - var attr = createLink('story', 'batchCreate', 'productID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution, '', true); + var attr = createLink('story', 'batchCreate', 'productID=' + selectProductID + '&branch=0' + '&moduleID=0&story=0&execution=' + executionID, '', true); $('#batchCreateStoryButton').attr('href',attr); }); }) diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 72d0478e0e..0e5b371ead 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -292,44 +292,45 @@ $lang->execution->aboveAllProduct = "All the above {$lang->productCommon}s"; $lang->execution->aboveAllExecution = "All the above {$lang->executionCommon}s"; /* Page prompt. */ -$lang->execution->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}."; -$lang->execution->selectExecution = "Select {$lang->executionCommon}"; -$lang->execution->beginAndEnd = 'Duration'; -$lang->execution->lblStats = 'Efforts'; -$lang->execution->stats = 'Available: %s(h). Estimates: %s(h). Cost: %s(h). Left: %s(h).'; -$lang->execution->taskSummary = "Total tasks on this page:%s. Waiting: %s. Doing: %s.     Estimates: %s(h). Cost: %s(h). Left: %s(h)."; -$lang->execution->pageSummary = "Total tasks: %total%. Waiting: %wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; -$lang->execution->checkedSummary = "Selected: %total%. Waiting: %wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; -$lang->execution->memberHoursAB = "%s has %s hours."; -$lang->execution->memberHours = '
%s Available Hours
%s
'; -$lang->execution->countSummary = '
Tasks
%s
Doing
%s
Waiting
%s
'; -$lang->execution->timeSummary = '
Estimates
%s
Cost
%s
Left
%s
'; -$lang->execution->groupSummaryAB = "
Tasks %s :Waiting %s   Doing %s
Estimates %s :Cost %s   Left %s
"; -$lang->execution->wbs = "Create Task"; -$lang->execution->batchWBS = "Batch Create Tasks"; -$lang->execution->howToUpdateBurn = "Help "; -$lang->execution->whyNoStories = "No story can be linked. Please check whether there is any story in {$lang->executionCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed."; -$lang->execution->productStories = "Stories linked to {$lang->executionCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. Link Stories now."; -$lang->execution->haveDraft = "%s stories in draft, so they can't be linked."; -$lang->execution->doneExecutions = 'Finished'; -$lang->execution->selectDept = 'Select Department'; -$lang->execution->selectDeptTitle = 'Select User'; -$lang->execution->copyTeam = 'Copy Team'; -$lang->execution->copyFromTeam = "Copy from {$lang->execution->common} Team: %s"; -$lang->execution->noMatched = "No {$lang->execution->common} including '%s'can be found."; -$lang->execution->copyTitle = "Choose a {$lang->execution->common} to copy."; -$lang->execution->copyNoExecution = "No {$lang->execution->common} can be copied."; -$lang->execution->copyFromExecution = "Copy from {$lang->execution->common} %s"; -$lang->execution->cancelCopy = 'Cancel Copy'; -$lang->execution->byPeriod = 'By Time'; -$lang->execution->byUser = 'By User'; -$lang->execution->noExecution = "No {$lang->executionCommon}. "; -$lang->execution->noExecutions = "No {$lang->execution->common}."; -$lang->execution->noPrintData = "No data can be printed."; -$lang->execution->noMembers = 'No team members yet. '; -$lang->execution->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s"; -// $lang->execution->linkProjectStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)"; -$lang->execution->linkAllStoryTip = "({$lang->SRCommon} has never been linked under the execution, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)"; +$lang->execution->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}."; +$lang->execution->batchCreateStoryTips = "Please select the product that needs to be created in batches"; +$lang->execution->selectExecution = "Select {$lang->executionCommon}"; +$lang->execution->beginAndEnd = 'Duration'; +$lang->execution->lblStats = 'Efforts'; +$lang->execution->stats = 'Available: %s(h). Estimates: %s(h). Cost: %s(h). Left: %s(h).'; +$lang->execution->taskSummary = "Total tasks on this page:%s. Waiting: %s. Doing: %s.     Estimates: %s(h). Cost: %s(h). Left: %s(h)."; +$lang->execution->pageSummary = "Total tasks: %total%. Waiting: %wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; +$lang->execution->checkedSummary = "Selected: %total%. Waiting: %wait%. Doing: %doing%. Estimates: %estimate%(h). Cost: %consumed%(h). Left: %left%(h)."; +$lang->execution->memberHoursAB = "%s has %s hours."; +$lang->execution->memberHours = '
%s Available Hours
%s
'; +$lang->execution->countSummary = '
Tasks
%s
Doing
%s
Waiting
%s
'; +$lang->execution->timeSummary = '
Estimates
%s
Cost
%s
Left
%s
'; +$lang->execution->groupSummaryAB = "
Tasks %s :Waiting %s   Doing %s
Estimates %s :Cost %s   Left %s
"; +$lang->execution->wbs = "Create Task"; +$lang->execution->batchWBS = "Batch Create Tasks"; +$lang->execution->howToUpdateBurn = "Help "; +$lang->execution->whyNoStories = "No story can be linked. Please check whether there is any story in {$lang->executionCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed."; +$lang->execution->productStories = "Stories linked to {$lang->executionCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. Link Stories now."; +$lang->execution->haveDraft = "%s stories in draft, so they can't be linked."; +$lang->execution->doneExecutions = 'Finished'; +$lang->execution->selectDept = 'Select Department'; +$lang->execution->selectDeptTitle = 'Select User'; +$lang->execution->copyTeam = 'Copy Team'; +$lang->execution->copyFromTeam = "Copy from {$lang->execution->common} Team: %s"; +$lang->execution->noMatched = "No {$lang->execution->common} including '%s'can be found."; +$lang->execution->copyTitle = "Choose a {$lang->execution->common} to copy."; +$lang->execution->copyNoExecution = "No {$lang->execution->common} can be copied."; +$lang->execution->copyFromExecution = "Copy from {$lang->execution->common} %s"; +$lang->execution->cancelCopy = 'Cancel Copy'; +$lang->execution->byPeriod = 'By Time'; +$lang->execution->byUser = 'By User'; +$lang->execution->noExecution = "No {$lang->executionCommon}. "; +$lang->execution->noExecutions = "No {$lang->execution->common}."; +$lang->execution->noPrintData = "No data can be printed."; +$lang->execution->noMembers = 'No team members yet. '; +$lang->execution->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s"; +// $lang->execution->linkProjectStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)"; +$lang->execution->linkAllStoryTip = "({$lang->SRCommon} has never been linked under the execution, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)"; if($config->systemMode == 'classic') $lang->execution->copyTeamTitle = "Choose a {$lang->execution->common} Team to copy."; if($config->systemMode == 'new') $lang->execution->copyTeamTitle = "Choose a {$lang->project->common} or {$lang->execution->common} Team to copy."; diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php index a0c9e7da30..1fb284b69b 100644 --- a/module/execution/view/kanban.html.php +++ b/module/execution/view/kanban.html.php @@ -105,7 +105,6 @@ js::set('priv', js::set('hasStoryButton', $hasStoryButton); js::set('hasBugButton', $hasBugButton); js::set('hasTaskButton', $hasTaskButton); -js::set('branch', $branchID); ?> -id);?> +id);?>