From 46df489385ba35a3da40bf109e9f58f3b062b958 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Tue, 2 Mar 2021 09:40:41 +0800 Subject: [PATCH] * Finish task #36363. --- module/personnel/control.php | 4 ++-- module/personnel/view/whitelist.html.php | 8 ++++---- module/product/control.php | 18 +++++++++--------- module/product/view/ajaxgetdropmenu.html.php | 6 +++--- module/program/model.php | 10 +++++----- module/story/model.php | 16 ++++++++-------- module/story/view/view.html.php | 6 +++--- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/module/personnel/control.php b/module/personnel/control.php index b055adbac7..77a3daea9c 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -157,8 +157,8 @@ class personnel extends control if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->getError())); $locateLink = $this->session->whitelistBrowse ? $this->session->whitelistBrowse : $this->createLink($module, 'whitelist', "objectID=$objectID"); - $openModule = $module == 'program' ? ($from == 'PRJ' || $from == 'my' ? '#open=project' : '#open=program') : ''; - $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink . $openModule)); + $openGroup = $module == 'program' ? ($from == 'PRJ' || $from == 'my' ? '#open=project' : '#open=program') : ''; + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink . $openGroup)); } $this->loadModel('dept'); diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php index c9c77d4eb9..243d1badf2 100644 --- a/module/personnel/view/whitelist.html.php +++ b/module/personnel/view/whitelist.html.php @@ -12,17 +12,17 @@ ?>
@@ -61,7 +61,7 @@ createLink($module, 'unbindWhielist', "id=$user->id&confirm=no"), '', 'hiddenwin', "title='{$lang->personnel->delete}' class='{$deleteClass}' $openModule"); + echo html::a($this->createLink($module, 'unbindWhielist', "id=$user->id&confirm=no"), '', 'hiddenwin', "title='{$lang->personnel->delete}' class='{$deleteClass}' $openGroup"); ?> diff --git a/module/product/control.php b/module/product/control.php index c0ad2a19f5..118984698f 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -901,15 +901,15 @@ class product extends control $moduleGroup = in_array($moduleGroup, array('product', 'qa'))? $moduleGroup : 'project'; $products = $moduleGroup == 'project' ? $this->product->getProductsByProject($this->session->PRJ) : $this->product->getList(); - $this->view->link = $this->product->getProductLink($module, $method, $extra); - $this->view->productID = $productID; - $this->view->module = $module; - $this->view->method = $method; - $this->view->extra = $extra; - $this->view->products = $products; - $this->view->projectID = $moduleGroup == 'project' ? $this->session->PRJ : 0; - $this->view->programs = $this->loadModel('program')->getPGMOption(); - $this->view->openModule = $moduleGroup; + $this->view->link = $this->product->getProductLink($module, $method, $extra); + $this->view->productID = $productID; + $this->view->module = $module; + $this->view->method = $method; + $this->view->extra = $extra; + $this->view->products = $products; + $this->view->projectID = $moduleGroup == 'project' ? $this->session->PRJ : 0; + $this->view->programs = $this->loadModel('program')->getPGMOption(); + $this->view->openGroup = $moduleGroup; $this->display(); } diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php index b5fa80fce9..b21c10ebac 100644 --- a/module/product/view/ajaxgetdropmenu.html.php +++ b/module/product/view/ajaxgetdropmenu.html.php @@ -27,19 +27,19 @@ foreach($products as $product) { $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id; $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id); - $myProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openModule'"); + $myProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openGroup'"); } else if($product->status == 'normal' and !($product->PO == $this->app->user->account)) { $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id; $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id); - $normalProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openModule'"); + $normalProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openGroup'"); } else if($product->status == 'closed') { $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id; $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $objectID); - $closedProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openModule'"); + $closedProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openGroup'"); } } ?> diff --git a/module/program/model.php b/module/program/model.php index 2cc4237685..89c3d0d513 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1958,9 +1958,9 @@ class programModel extends model echo "
"; } - $from = $project->from == 'PRJ' ? 'PRJ' : 'pgmproject'; - $openModule = $project->from == 'PRJ' ? 'project' : 'program'; - common::printIcon('program', 'PRJEdit', "projectID=$project->id&from=$from", $project, 'list', 'edit', '', '', '', "data-group=$openModule", '', $project->id); + $from = $project->from == 'PRJ' ? 'PRJ' : 'pgmproject'; + $openGroup = $project->from == 'PRJ' ? 'project' : 'program'; + common::printIcon('program', 'PRJEdit', "projectID=$project->id&from=$from", $project, 'list', 'edit', '', '', '', "data-group=$openGroup", '', $project->id); common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', '', $this->lang->project->team, $project->id); if($this->config->systemMode == 'new') common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', '', '', $project->id); @@ -1969,8 +1969,8 @@ class programModel extends model echo "
"; echo ""; echo ""; echo "
"; diff --git a/module/story/model.php b/module/story/model.php index b92761810c..fdf7a64612 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3279,12 +3279,12 @@ class storyModel extends model $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlinkStory); - $module = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story'; - $canView = common::hasPriv($module, 'view'); - $openModule = $this->app->rawModule == 'projectstory' ? 'project' : 'product'; - $storyLink = helper::createLink($module, 'view', "storyID=$story->id"); - $account = $this->app->user->account; - $id = $col->id; + $module = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story'; + $canView = common::hasPriv($module, 'view'); + $openGroup = $this->app->rawModule == 'projectstory' ? 'project' : 'product'; + $storyLink = helper::createLink($module, 'view', "storyID=$story->id"); + $account = $this->app->user->account; + $id = $col->id; if($col->show) { $class = "c-{$id}"; @@ -3347,7 +3347,7 @@ class storyModel extends model case 'id': if($canBatchAction) { - echo html::checkbox('storyIdList', array($story->id => '')) . html::a($storyLink, sprintf('%03d', $story->id), '', "data-group='$openModule'"); + echo html::checkbox('storyIdList', array($story->id => '')) . html::a($storyLink, sprintf('%03d', $story->id), '', "data-group='$openGroup'"); } else { @@ -3365,7 +3365,7 @@ class storyModel extends model if($story->branch and isset($branches[$story->branch])) echo "{$branches[$story->branch]} "; if($story->module and isset($modulePairs[$story->module])) echo "{$modulePairs[$story->module]} "; if($story->parent > 0) echo '' . $this->lang->story->childrenAB . ' '; - echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-group='$openModule'") : "{$story->title}"; + echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-group='$openGroup'") : "{$story->title}"; if(!empty($story->children)) echo ''; break; case 'plan': diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 3fac5eb790..84a0457fc5 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -50,14 +50,14 @@ app->rawModule == 'projectstory') { $otherParam = "storyID=&projectID={$this->session->PRJ}"; - $openModule = 'project'; + $openGroup = 'project'; } ?> - product}&branch={$story->branch}&moduleID={$story->module}&$otherParam", "" . $lang->story->create, '', "class='btn btn-primary' data-group='$openModule'"); ?> + product}&branch={$story->branch}&moduleID={$story->module}&$otherParam", "" . $lang->story->create, '', "class='btn btn-primary' data-group='$openGroup'"); ?>