Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix details.

Browse Source
This commit is contained in:
sgm0422
2021-01-03 13:32:23 +08:00
parent 3b79f481e9
commit 7cb90754df
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+1 -3
View File
@@ -481,10 +481,8 @@ class productModel extends model
$currentProductName = $currentProduct->name;
}
$active = isset($currentProduct->type) && $currentProduct->type != 'normal' ? '' : 'active';
$dropMenuLink = helper::createLink('product', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
$output = "<div class='btn-group header-angle-btn $active' id='swapper'><div class='btn btn-span'>{$this->lang->productCommon}</div><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProductName}'><span class='text'>{$currentProductName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output = "<div class='btn-group header-angle-btn' id='swapper'><div class='btn btn-span'>{$this->lang->productCommon}</div><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProductName}'><span class='text'>{$currentProductName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
$output .= "</div></div>";
module/program/model.php
+3 -7
View File
@@ -350,14 +350,12 @@ class programModel extends model
* @access private
* @return string
*/
public function getPGMSwitcher($programID = 0, $active = false)
public function getPGMSwitcher($programID = 0)
{
$currentProgramName = '';
$currentModule = $this->app->moduleName;
$currentMethod = $this->app->methodName;
$active = $active ? 'active' : '';
if($programID)
{
setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
@@ -370,7 +368,7 @@ class programModel extends model
}
$dropMenuLink = helper::createLink('program', 'ajaxGetPGMDropMenu', "objectID=$programID&module=$currentModule&method=$currentMethod");
$output = "<div class='btn-group header-angle-btn $active' id='swapper'><div class='btn btn-span'>{$this->lang->program->common}</div><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProgramName}'><span class='text'>{$currentProgramName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output = "<div class='btn-group header-angle-btn' id='swapper'><div class='btn btn-span'>{$this->lang->program->common}</div><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProgramName}'><span class='text'>{$currentProgramName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>'; $output .= "</div></div>";
return $output;
@@ -788,8 +786,6 @@ class programModel extends model
*/
public function getPRJSwitcher($projectID, $currentModule, $currentMethod)
{
$active = strpos($currentMethod, 'prj') !== false ? true : false;
if($currentModule == 'program' && $currentMethod != 'index') return;
$this->loadModel('project');
@@ -801,7 +797,7 @@ class programModel extends model
}
$dropMenuLink = helper::createLink('program', 'ajaxGetPRJDropMenu', "objectID=$projectID&module=$currentModule&method=$currentMethod");
$output = "<div class='btn-group header-angle-btn active' id='swapper'><div class='btn btn-span'>{$this->lang->program->project}</div><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProjectName}'><span class='text'>{$currentProjectName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output = "<div class='btn-group header-angle-btn' id='swapper'><div class='btn btn-span'>{$this->lang->program->project}</div><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProjectName}'><span class='text'>{$currentProjectName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
$output .= "</div></div>";
module/tree/control.php
-1
View File
@@ -69,7 +69,6 @@ class tree extends control
$moduleIndex = array_search('tree', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
$this->lang->product->menu = $this->lang->product->viewMenu;
$this->lang->noMenuModule[] = 'tree';
$this->lang->product->switcherMenu = $this->loadModel('product')->getSwitcher($rootID, 'story');
$this->lang->product->mainMenuAction = $this->product->getProductMainAction();