From beadb99a54eba446cb26044c08ff49fa0e9ce072 Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Thu, 18 Mar 2021 13:45:37 +0800 Subject: [PATCH 1/7] * Fix link of my module. --- module/build/control.php | 4 ++-- module/common/lang/zh-cn.php | 2 +- module/my/view/bug.html.php | 4 ++-- module/my/view/testcase.html.php | 6 +++--- module/my/view/testtask.html.php | 16 ++++++++-------- module/product/control.php | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/module/build/control.php b/module/build/control.php index 629bfdc7c3..37e541f99e 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -32,7 +32,7 @@ class build extends control $this->executeHooks($buildID); - if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProjectBuilds($executionID)")); // Code for task #5126. + if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadExecutionBuilds($executionID)")); // Code for task #5126. $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID"))); } @@ -350,7 +350,7 @@ class build extends control { $html = html::a($this->createLink('build', 'create', "executionID=$executionID&productID=$productID", '', $onlybody = true), $this->lang->build->create, '', "data-toggle='modal' data-type='iframe'"); $html .= '  '; - $html .= html::a("javascript:loadProjectBuilds($executionID)", $this->lang->refresh); + $html .= html::a("javascript:loadExecutionBuilds($executionID)", $this->lang->refresh); die($html); } die(html::select('build', $builds, $build, "class='form-control'")); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index e1e52cdb41..51fdef7fba 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -948,6 +948,6 @@ $lang->projectstory->menu = new stdclass(); $lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; -$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'qa', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry'); +$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry'); include (dirname(__FILE__) . '/menuOrder.php'); diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index 02c932bc4a..f8fff37170 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -103,8 +103,8 @@ pri?>' title='bug->priList, $bug->pri);?>'>bug->priList, $bug->pri)?> - createLink('bug', 'view', "bugID=$bug->id", '', '', $bug->project), $bug->title, null, "style='color: $bug->color' title={$bug->title} data-group='project'");?> - createLink('product', 'view', "productID=$bug->product", '', '', $bug->project), $bug->productName, null, "title={$bug->productName} data-group='product'");?> + createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color' title={$bug->title}");?> + createLink('product', explode('-', $config->productLink)[1], "productID=$bug->product"), $bug->productName, null, "title={$bug->productName}");?> bug->typeList, $bug->type, '');?> openedBy);?> diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index d377925219..a906282949 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -85,7 +85,7 @@ pri?>' title='testcase->priList, $case->pri, $case->pri);?>'>testcase->priList, $case->pri, $case->pri)?> version";?> task";?> - createLink('testcase', 'view', $params, '', '', $case->project), $case->title, null, "style='color: $case->color' data-group='project'");?> + createLink('testcase', 'view', $params), $case->title, null, "style='color: $case->color'");?> taskName;?> @@ -99,8 +99,8 @@ product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', '', '', $case->project); - common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project); + common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug'); + common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$caseID", $case, 'list', 'copy'); common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project); common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project); common::printIcon('testcase', 'edit', "caseID=$caseID", $case, 'list', 'edit', '', '', '', '', '', $case->project); diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 0c2a4cf2f9..5f2053f694 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -47,22 +47,22 @@ id);?> - createLink('testtask', 'view', "taskID=$task->id", '', '', $task->project), $task->name, '', "data-group='project'");?> + createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> executionName?> - build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->project), $task->buildName, '', "data-group='project'"));?> + build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> begin?> end?> processStatus('testtask', $task);?> id", $task, 'list', 'sitemap', '', '', '', '', '', $task->project); - common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px', '', $task->project); - common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link', '', '', '', '', '', $task->project); - common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag', '', '', '', '', '', $task->project); - common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list','','','',true, '', '', $task->project); + common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap'); + common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link'); + common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'flag'); + common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list', '', '', '', true); if(common::hasPriv('testtask', 'delete', $task)) { - $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes", '', '', $task->project); + $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"taskList\", confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'"); } ?> diff --git a/module/product/control.php b/module/product/control.php index 1a233c2bb8..123baba0fc 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -853,7 +853,7 @@ class product extends control { $executionsName = "executions[$number]"; $executions = empty($executions) ? array('' => '') : $executions; - die(html::select($executionsName, $executions, '', "class='form-control' onchange='loadProjectBuilds($productID, this.value, $number)'")); + die(html::select($executionsName, $executions, '', "class='form-control' onchange='loadExecutionBuilds($executionID, this.value, $number)'")); } } From 2e737fe6675f2408be18d5aac88abfb0b3377a40 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Thu, 18 Mar 2021 16:25:03 +0800 Subject: [PATCH 2/7] * Fix a bug. --- module/testtask/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index 112fa4cb88..d928652e23 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1616,7 +1616,7 @@ class testtaskModel extends model if(common::hasPriv('testtask', 'unlinkCase', $run)) { $unlinkURL = helper::createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"casesForm\", confirmUnlink)", '', '', "title='{$this->lang->testtask->unlinkCase}' class='btn'"); + echo html::a("javascript:void(0)", '', '', "title='{$this->lang->testtask->unlinkCase}' class='btn' onclick='ajaxDelete(\"$unlinkURL\", \"casesForm\", confirmUnlink)'"); } break; From 7760c6066d678b455da3b77c6e36f14d0f5349cd Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Thu, 18 Mar 2021 16:26:17 +0800 Subject: [PATCH 3/7] - Remove module menu of jenkins. --- module/common/lang/en.php | 2 +- module/common/lang/zh-cn.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 62aa843006..cce0be9d3b 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -930,6 +930,6 @@ $lang->projectstory->menu = new stdclass(); $lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; -$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); +$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry', 'jenkins'); include (dirname(__FILE__) . '/menuOrder.php'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 797f88d556..a1784650c1 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -950,6 +950,6 @@ $lang->projectstory->menu = new stdclass(); $lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; -$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry'); +$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'project', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry', 'jenkins'); include (dirname(__FILE__) . '/menuOrder.php'); From 7fa5a2dab0be287da4556dad0971e3a271ef5b6c Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 18 Mar 2021 16:36:47 +0800 Subject: [PATCH 4/7] * Fix session app. --- framework/base/router.class.php | 10 ++++------ module/my/control.php | 3 +-- module/program/model.php | 3 ++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/framework/base/router.class.php b/framework/base/router.class.php index b8281b8c0f..87ec537a7f 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -2492,7 +2492,7 @@ class super * @access public * @return void */ - public function set($key, $value) + public function set($key, $value, $openApp = '') { if($this->scope == 'post') { @@ -2512,9 +2512,8 @@ class super } elseif($this->scope == 'session') { - $openApp = $this->openApp; - empty($openApp) ? $_SESSION[$key] = $value : $_SESSION['app-' . $openApp][$key] = $value; - $_SESSION[$key] = $value; + $openApp = $openApp ? $openApp : $this->openApp; + $openApp ? $_SESSION["app-$openApp"][$key] = $value : $_SESSION[$key] = $value; } elseif($this->scope == 'env') { @@ -2562,9 +2561,8 @@ class super elseif($this->scope == 'session') { $openApp = $this->openApp; - if(!empty($openApp) and isset($_SESSION['app-' . $openApp][$key])) return $_SESSION['app-' . $openApp][$key]; + if($openApp and isset($_SESSION["app-$openApp"][$key])) return $_SESSION["app-$openApp"][$key]; if(isset($_SESSION[$key])) return $_SESSION[$key]; - return false; } elseif($this->scope == 'env') diff --git a/module/my/control.php b/module/my/control.php index f731e53bb5..82f811e1c7 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -273,8 +273,7 @@ class my extends control /* Save session. */ if($this->app->viewType != 'json') { - $this->session->set('taskList', $this->app->getURI(true)); - $this->session->set('storyList', $this->app->getURI(true)); + $this->session->set('taskList', $this->app->getURI(true), 'execution'); } /* Load pager. */ diff --git a/module/program/model.php b/module/program/model.php index 978f35996d..4f78281241 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -96,8 +96,9 @@ class programModel extends model ->where('type')->in('program,project') ->andWhere('deleted')->eq(0) ->beginIF(!$this->app->user->admin) - ->andWhere('id')->in($this->app->user->view->programs) + ->andWhere('(id')->in($this->app->user->view->programs) ->orWhere('id')->in($this->app->user->view->projects) + ->markRight(1) ->fi() ->beginIF($status != 'all')->andWhere('status')->eq($status)->fi() ->beginIF(!$this->cookie->showClosed)->andWhere('status')->ne('closed')->fi() From 53cf4ebdcd8b271a8d896f4ea32767dad9b28656 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 18 Mar 2021 16:57:31 +0800 Subject: [PATCH 5/7] * Fix bug. --- module/build/control.php | 3 +++ module/common/model.php | 1 + module/product/control.php | 10 +--------- module/product/model.php | 4 ++++ module/product/view/ajaxgetdropmenu.html.php | 8 ++++---- module/program/view/ajaxgetdropmenu.html.php | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/module/build/control.php b/module/build/control.php index d768e9aa81..1da5979ced 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -27,7 +27,10 @@ class build extends control if($this->app->openApp == 'project') { + $model = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('model'); + $this->lang->project->menu = $this->lang->menu->$model; commonModel::setAppObjectID('project', $projectID); + $executions = $this->execution->getPairs($projectID); $executionID = key($executions); } diff --git a/module/common/model.php b/module/common/model.php index 04917e4964..accb24ebf4 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -696,6 +696,7 @@ class commonModel extends model /* Avoid highlighting the same navigation method at the same time. */ if($currentModule == 'feedback' and $currentMethod == 'admin') $active = ''; if($currentModule == 'product' and $currentMethod == 'browse') $active = ''; + if($currentModule == 'product' and $currentMethod == 'create') $active = ''; if($currentModule == 'story') $active = ''; $misc = $openApp != $lang->navGroup->$module ? "data-app='$openApp'" : ''; diff --git a/module/product/control.php b/module/product/control.php index 76e8191a49..c998dffb50 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -321,15 +321,7 @@ class product extends control $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate)); } - if($programID) - { - $this->lang->program->switcherMenu = $this->loadModel('program')->getSwitcher($programID, true); - commonModel::setAppObjectID('program', $programID); - } - else - { - $this->lang->product->switcherMenu = $this->product->getSwitcher(); - } + if($programID) commonModel::setAppObjectID('program', $programID); $this->loadModel('user'); $poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed', '', $this->config->maxCount); diff --git a/module/product/model.php b/module/product/model.php index febb71a391..0e8be554c1 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1555,6 +1555,10 @@ class productModel extends model { $link = helper::createLink($module, $method, "productID=%s&type=$extra"); } + elseif($module == 'product' && $method == 'create') + { + $link = helper::createLink($module, 'browse', "productID=%s&type=$extra"); + } elseif($module == 'qa' && $method == 'index') { $link = helper::createLink('bug', 'browse', "productID=%s" . ($branch ? "&branch=%s" : '')); diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php index 4d5391c44d..45311efea1 100644 --- a/module/product/view/ajaxgetdropmenu.html.php +++ b/module/product/view/ajaxgetdropmenu.html.php @@ -28,19 +28,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, $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'"); + $myProductsHtml .= html::a($linkHtml, $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'"); } 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, $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'"); + $normalProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'"); } 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, $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'"); + $closedProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'"); } } ?> @@ -62,7 +62,7 @@ foreach($products as $product)
' . $lang->product->all, '', 'class="not-list-item"'); ?> - ' . $lang->product->create, '', 'class="not-list-item"'); ?> + ' . $lang->product->create, '', 'class="not-list-item" data-app="product"'); ?> product->closed?>
diff --git a/module/program/view/ajaxgetdropmenu.html.php b/module/program/view/ajaxgetdropmenu.html.php index 0d1d968201..b8eefa99bb 100644 --- a/module/program/view/ajaxgetdropmenu.html.php +++ b/module/program/view/ajaxgetdropmenu.html.php @@ -23,7 +23,7 @@ $programsPinYin = common::convert2Pinyin($programNames); .tree li.has-list.open:before {border-left: none;} #programTree li {padding: 0 0 0 8px;} #programTree li.has-list {padding-left: 20px;} -#programTree li > a {display: block; padding: 5px 0; border-radius: 2px; padding-left: 6px; height: 30px;} +#programTree li > a {display: block; padding: 6px 0; border-radius: 2px; padding-left: 6px; height: 30px;} #programTree li > a > span {display: inline-block;} #programTree li > a > span + span {margin-left: 8px;} #programTree li.selected > a {background-color: #E8F3FC;} From bca95c87eb1fd3a009d3790bfdd3c31052f214e9 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 18 Mar 2021 16:58:40 +0800 Subject: [PATCH 6/7] * Fix program drop link. --- module/program/model.php | 6 ++++-- module/program/view/ajaxgetdropmenu.html.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/module/program/model.php b/module/program/model.php index 4f78281241..1c28de1157 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -407,10 +407,12 @@ class programModel extends model * @param int $programID * @param string $from * @param string $vars + * @param string $moduleName + * @param string $methodName * @access public * @return string */ - public function getTreeMenu($programID = 0, $from = 'program', $vars = '') + public function getTreeMenu($programID = 0, $from = 'program', $vars = '', $moduleName = '', $methodName = '') { $programMenu = array(); $query = $this->dao->select('*')->from(TABLE_PROJECT) @@ -430,7 +432,7 @@ class programModel extends model while($program = $stmt->fetch()) { - $link = $from == 'program' ? helper::createLink('program', 'product', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars); + $link = $from == 'program' ? helper::createLink($moduleName, $methodName, "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars); $linkHtml = html::a($link, html::icon($this->lang->icons[$program->type], 'icon icon-sm text-muted') . ' ' . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name"); if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id])) diff --git a/module/program/view/ajaxgetdropmenu.html.php b/module/program/view/ajaxgetdropmenu.html.php index b8eefa99bb..38da2a55c0 100644 --- a/module/program/view/ajaxgetdropmenu.html.php +++ b/module/program/view/ajaxgetdropmenu.html.php @@ -9,7 +9,7 @@ $programsPinYin = common::convert2Pinyin($programNames);
program->getTreeMenu(); + echo $this->program->getTreeMenu(0, 'program', '', $module, $method); ?>
From d6e6641c1cb07315f1eb6f58fe8dff1e31789014 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 18 Mar 2021 17:00:06 +0800 Subject: [PATCH 7/7] * Fix bug. --- module/common/model.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index accb24ebf4..04917e4964 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -696,7 +696,6 @@ class commonModel extends model /* Avoid highlighting the same navigation method at the same time. */ if($currentModule == 'feedback' and $currentMethod == 'admin') $active = ''; if($currentModule == 'product' and $currentMethod == 'browse') $active = ''; - if($currentModule == 'product' and $currentMethod == 'create') $active = ''; if($currentModule == 'story') $active = ''; $misc = $openApp != $lang->navGroup->$module ? "data-app='$openApp'" : '';