From c257c59296db0a4d51e9e3ec97c16de1e8ffc751 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Thu, 24 Dec 2020 13:16:29 +0800 Subject: [PATCH 1/2] * Adjust the style code for firefox and ie. --- module/program/view/pgmproduct.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/program/view/pgmproduct.html.php b/module/program/view/pgmproduct.html.php index eed27ae13e..c40bdb1d9b 100644 --- a/module/program/view/pgmproduct.html.php +++ b/module/program/view/pgmproduct.html.php @@ -51,7 +51,7 @@ - story->activate;?> + story->activate;?> story->close;?> story->draft;?> story->completeRate;?> From e9e74e06527299b6e78c2fef96cfa2695c5c8d17 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Thu, 24 Dec 2020 13:30:14 +0800 Subject: [PATCH 2/2] * Finish task#8737. --- module/product/control.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/module/product/control.php b/module/product/control.php index 429cbbce88..4de36db0e1 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -373,11 +373,11 @@ class product extends control /** * Batch edit products. * - * @param int $productID + * @param int $programID * @access public * @return void */ - public function batchEdit($productID = 0) + public function batchEdit($programID = 0) { $this->lang->product->switcherMenu = ''; if($this->post->names) @@ -413,6 +413,15 @@ class product extends control $appendRdUsers[$product->RD] = $product->RD; } + if($programID) + { + $this->app->rawModule = 'program'; + $this->app->rawMethod = 'pgmproduct'; + $this->lang->navGroup->program = 'program'; + $this->loadModel('program')->setPGMViewMenu($programID); + $this->lang->program->switcherMenu = $this->program->getPGMCommonAction() . $this->program->getPGMSwitcher($programID, true); + } + $this->loadModel('user'); $poUsers = $this->user->getPairs('nodeleted|pofirst', $appendPoUsers); if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;