From 23c78dece4c8b845bd4d2b32463fa96e36754fd9 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 20 Nov 2019 14:25:59 +0800 Subject: [PATCH] * finish task #6548. --- module/task/css/edit.css | 1 + module/task/js/create.js | 10 ++++++++++ module/task/js/edit.js | 10 ++++++++++ module/task/lang/zh-cn.php | 1 + module/task/view/create.html.php | 9 ++++++++- module/task/view/edit.html.php | 12 +++++++++++- module/tree/control.php | 4 ++-- module/tree/model.php | 8 ++++---- 8 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 module/task/css/edit.css diff --git a/module/task/css/edit.css b/module/task/css/edit.css new file mode 100644 index 0000000000..5368546003 --- /dev/null +++ b/module/task/css/edit.css @@ -0,0 +1 @@ +.pl-10px{padding-left:10px;} diff --git a/module/task/js/create.js b/module/task/js/create.js index faa05fc6c6..bab42c0369 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -411,6 +411,16 @@ $(document).ready(function() }); adjustButtons(); + + $('#showAllModule').change(function() + { + var moduleID = $('#moduleIdBox #module').val(); + var extra = $(this).prop('checked') ? 'allModule' : ''; + $('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + projectID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function() + { + $('#moduleIdBox #module').val(moduleID).attr('onchange', "setStories(this.value, " + projectID + ")").chosen(); + }); + }); }); $('#modalTeam .btn').click(function() diff --git a/module/task/js/edit.js b/module/task/js/edit.js index b680d1f535..9f30a7cdb8 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -126,4 +126,14 @@ $(document).ready(function() }); adjustButtons(); + + $('#showAllModule').change(function() + { + var moduleID = $('#moduleIdBox #module').val(); + var extra = $(this).prop('checked') ? 'allModule' : ''; + $('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + projectID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function() + { + $('#moduleIdBox #module').val(moduleID).attr('onchange', "loadModuleRelated()").chosen(); + }); + }); }); diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 7f70d7c4c5..2e06a5970a 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -51,6 +51,7 @@ $lang->task->progressAB = '%'; $lang->task->progressTips = '已消耗/(已消耗+剩余)'; $lang->task->copy = '复制任务'; $lang->task->waitTask = '未开始的任务'; +$lang->task->allModule = '所有模块'; $lang->task->common = '任务'; $lang->task->id = '编号'; diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 02268a2f16..9f347c486a 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -41,7 +41,13 @@ task->module;?> - module, "class='form-control chosen' onchange='setStories(this.value,$project->id)'");?> + module, "class='form-control chosen' onchange='setStories(this.value, $project->id)'");?> + +
+ +
+ + task->assignedTo;?> @@ -298,4 +304,5 @@ +id);?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index dddada366d..933faa2bbd 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -96,7 +96,16 @@ task->module;?> - module, 'class="form-control chosen" onchange="loadModuleRelated()"');?> + +
+ module, 'class="form-control chosen" onchange="loadModuleRelated()"');?> + +
+ +
+ +
+ global->flow != 'onlyTask' and $project->type != 'ops'):?> @@ -278,4 +287,5 @@ +id);?> diff --git a/module/tree/control.php b/module/tree/control.php index ea1bb74b64..45a77a89d9 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -371,11 +371,11 @@ class tree extends control * @access public * @return string the html select string. */ - public function ajaxGetOptionMenu($rootID, $viewType = 'story', $branch = 0, $rootModuleID = 0, $returnType = 'html', $fieldID = '', $needManage = false) + public function ajaxGetOptionMenu($rootID, $viewType = 'story', $branch = 0, $rootModuleID = 0, $returnType = 'html', $fieldID = '', $needManage = false, $extra = '') { if($viewType == 'task') { - $optionMenu = $this->tree->getTaskOptionMenu($rootID); + $optionMenu = $this->tree->getTaskOptionMenu($rootID, 0, 0, $extra); } else { diff --git a/module/tree/model.php b/module/tree/model.php index 385a30691c..ad249c4c75 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -219,7 +219,7 @@ class treeModel extends model * @access public * @return void */ - public function getTaskOptionMenu($rootID, $productID = 0, $startModule = 0) + public function getTaskOptionMenu($rootID, $productID = 0, $startModule = 0, $extra = '') { /* If createdVersion <= 4.1, go to getOptionMenu(). */ $products = $this->loadModel('product')->getProductsByProject($rootID); @@ -286,7 +286,7 @@ class treeModel extends model { if(!strpos($menu, '|')) continue; list($label, $moduleID) = explode('|', $menu); - if(isset($projectModules[$moduleID])) $lastMenu[$moduleID] = $label; + if(isset($projectModules[$moduleID]) or strpos($extra, 'allModule') !== false) $lastMenu[$moduleID] = $label; } foreach($topMenu as $moduleID => $moduleName) { @@ -421,7 +421,7 @@ class treeModel extends model */ public function getTaskTreeMenu($rootID, $productID = 0, $startModule = 0, $userFunc, $extra = '') { - $extra = array('projectID' => $rootID, 'productID' => $productID, 'tip' => true); + $extra = array('projectID' => $rootID, 'productID' => $productID, 'tip' => true, 'extra' => $extra); /* If createdVersion <= 4.1, go to getTreeMenu(). */ $products = $this->loadModel('product')->getProductsByProject($rootID); @@ -478,7 +478,7 @@ class treeModel extends model $stmt = $this->dbh->query($query); while($module = $stmt->fetch()) { - if(!$manage and !isset($projectModules[$module->id])) continue; + if(!$manage and !isset($projectModules[$module->id]) and strpos($extra['extra'], 'allModule') === false) continue; $this->buildTree($treeMenu, $module, 'task', $userFunc, $extra); } if(isset($treeMenu[0]) and $branch) $treeMenu[0] = "
  • $branchName
    • ";