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

* Move setLibMenu from caselibModel to caselibZen.

Browse Source
This commit is contained in:
liumengyi
2023-09-19 09:27:20 +08:00
parent 40d90ea694
commit d49fc3daf3
3 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/caselib/control.php
+7 -7
View File
@@ -54,7 +54,7 @@ class caselib extends control
$libraries = $this->caselib->getLibraries();
$libID = $this->caselibZen->saveLibState(0, $libraries);
$this->caselib->setLibMenu($libraries, $libID);
$this->caselibZen->setLibMenu($libraries, $libID);
$this->view->title = $this->lang->caselib->common . $this->lang->colon . $this->lang->caselib->create;
$this->display();
@@ -90,7 +90,7 @@ class caselib extends control
/* Set lib menu. */
$libraries = $this->caselib->getLibraries();
$libID = $this->caselibZen->saveLibState($libID, $libraries);
$this->caselib->setLibMenu($libraries, $libID);
$this->caselibZen->setLibMenu($libraries, $libID);
$this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->caselib->edit;
$this->view->lib = $this->caselib->getById($libID);
@@ -164,7 +164,7 @@ class caselib extends control
$this->caselibZen->setBrowseSessionAndCookie($libID, $browseType, $param);
/* Set lib menu. */
$this->caselib->setLibMenu($libraries, $libID);
$this->caselibZen->setLibMenu($libraries, $libID);
/* Set module and query id. */
$moduleID = ($browseType == 'bymodule') ? $param : ($browseType == 'bysearch' ? 0 : ($this->cookie->libCaseModule ? $this->cookie->libCaseModule : 0));
@@ -242,7 +242,7 @@ class caselib extends control
/* Set lib menu. */
$libraries = $this->caselib->getLibraries();
$libID = $this->caselibZen->saveLibState($libID, $libraries);
$this->caselib->setLibMenu($libraries, $libID);
$this->caselibZen->setLibMenu($libraries, $libID);
$type = 'feature';
$stage = '';
@@ -318,7 +318,7 @@ class caselib extends control
if(empty($libraries)) $this->locate(inlink('create'));
/* Set lib menu. */
$this->caselib->setLibMenu($libraries, $libID);
$this->caselibZen->setLibMenu($libraries, $libID);
$this->view->title = $libraries[$libID] . $this->lang->colon . $this->lang->testcase->batchCreate;
$this->view->libID = $libID;
@@ -343,7 +343,7 @@ class caselib extends control
/* Set lib menu. */
$libraries = $this->caselib->getLibraries();
$this->caselib->setLibMenu($libraries, $libID);
$this->caselibZen->setLibMenu($libraries, $libID);
$this->loadModel('testcase');
$this->view->title = $lib->name . $this->lang->colon . $this->lang->caselib->view;
@@ -557,7 +557,7 @@ class caselib extends control
$libraries = $this->caselib->getLibraries();
if(empty($libraries)) $this->locate(inlink('create'));
$this->caselib->setLibMenu($libraries, $libID);
$this->caselibZen->setLibMenu($libraries, $libID);
$caseLang = $this->lang->testcase;
$caseConfig = $this->config->testcase;
module/caselib/model.php
-34
View File
@@ -13,40 +13,6 @@
<?php
class caselibModel extends model
{
/**
* Set library menu.
*
* @param array $libraries
* @param int $libID
* @access public
* @return void
*/
public function setLibMenu($libraries, $libID)
{
/* Set case lib menu. */
$products = $this->loadModel('product')->getPairs();
if(!empty($products) and $this->session->product) $this->loadModel('qa')->setMenu($this->session->product);
if(empty($products)) $this->loadModel('qa')->setMenu();
$this->lang->qa->menu->caselib['subModule'] .= ',testcase';
if($libraries)
{
$libName = '';
if(!isset($libraries[$libID])) $libName = $this->dao->select('name')->from(TABLE_TESTSUITE)->where('id')->eq($libID)->fetch('name');
$currentLibName = zget($libraries, $libID, $libName);
setCookie("lastCaseLib", $libID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
$dropMenuLink = helper::createLink('caselib', 'ajaxGetDropMenu', "objectID=$libID&module=caselib&method=browse");
$output = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentLibName}'><span class='text'>{$currentLibName}</span> <span class='caret' style='margin-top: 3px'></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>";
$this->lang->switcherMenu = $output;
}
}
/**
* Get caselib info by id.
*
module/caselib/zen.php
+39
View File
@@ -2,6 +2,45 @@
declare(strict_types=1);
class caselibZen extends caselib
{
/**
* 设置用例库菜单。
* Set library menu.
*
* @param array $libraries
* @param int $libID
* @access public
* @return void
*/
public function setLibMenu(array $libraries, int $libID): void
{
/* Set case lib menu. */
$products = $this->loadModel('product')->getPairs();
if(!empty($products) and $this->session->product) $this->loadModel('qa')->setMenu($this->session->product);
if(empty($products)) $this->loadModel('qa')->setMenu();
$this->lang->qa->menu->caselib['subModule'] .= ',testcase';
if($libraries)
{
$libName = '';
if(!isset($libraries[$libID]))
{
$lib = $this->caselib->getByID($libID);
$libName = $lib ? $lib->name : '';
}
$currentLibName = zget($libraries, $libID, $libName);
setCookie("lastCaseLib", (string)$libID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
$dropMenuLink = helper::createLink('caselib', 'ajaxGetDropMenu', "objectID={$libID}&module=caselib&method=browse");
$output = "<div class='btn-group header-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentLibName}'><span class='text'>{$currentLibName}</span> <span class='caret' style='margin-top: 3px'></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>";
$this->lang->switcherMenu = $output;
}
}
/**
* 设置用例库状态。
* Save lib state.