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

Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
zhujinyong
2021-03-04 13:48:59 +08:00
parent b30d6a3d67 77341fc9e0
commit 14c36ca740
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/caselib/control.php
+1 -1
View File
@@ -32,7 +32,7 @@ class caselib extends control
parent::__construct($moduleName, $methodName);
/* Set testtask menu group. */
$this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
$this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
if(!$this->projectID)
{
$this->app->loadConfig('qa');
module/caselib/model.php
+5 -5
View File
@@ -234,7 +234,7 @@ class caselibModel extends model
$lib = fixer::input('post')
->stripTags($this->config->caselib->editor->create['id'], $this->config->allowedTags)
->setForce('type', 'library')
->setIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa', 'PRJ', $this->session->PRJ)
->setIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa', 'project', $this->session->project)
->add('addedBy', $this->app->user->account)
->add('addedDate', helper::now())
->remove('uid')
@@ -278,7 +278,7 @@ class caselibModel extends model
{
$cases = $this->dao->select('*')->from(TABLE_CASE)
->where('lib')->eq((int)$libID)
->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa')->andWhere('project')->eq($this->session->project)->fi()
->andWhere('product')->eq(0)
->beginIF($moduleIdList)->andWhere('module')->in($moduleIdList)->fi()
->beginIF($browseType == 'wait')->andWhere('status')->eq($browseType)->fi()
@@ -315,7 +315,7 @@ class caselibModel extends model
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($caseQuery)
->beginIF($queryLibID != 'all')->andWhere('lib')->eq((int)$libID)->fi()
->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa')->andWhere('project')->eq($this->session->project)->fi()
->andWhere('product')->eq(0)
->andWhere('deleted')->eq(0)
->orderBy($sort)->page($pager)->fetchAll();
@@ -536,7 +536,7 @@ class caselibModel extends model
}
else
{
$caseData->PRJ = $this->session->PRJ;
$caseData->project = $this->session->project;
$caseData->version = 1;
$caseData->openedBy = $this->app->user->account;
$caseData->openedDate = $now;
@@ -630,7 +630,7 @@ class caselibModel extends model
$data[$i]->openedDate = $now;
$data[$i]->status = $forceNotReview ? 'normal' : 'wait';
$data[$i]->version = 1;
if($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa') $data[$i]->PRJ = $this->session->PRJ;
if($this->config->systemMode == 'new' and $this->lang->navGroup->caselib != 'qa') $data[$i]->project = $this->session->project;
$this->dao->insert(TABLE_CASE)->data($data[$i])
->autoCheck()
module/ci/control.php
+1 -1
View File
@@ -52,7 +52,7 @@ class ci extends control
$compiles = $this->loadModel('compile')->getUnexecutedList();
foreach($compiles as $compile)
{
if($compile->atTime and date('H:i') < $compile->atTime) continue;
if($compile->atTime and date('H:i') < $compile->atTime) continue;
$this->compile->exec($compile);
}
echo 'success';
module/ci/model.php
+3 -3
View File
@@ -18,11 +18,11 @@ class ciModel extends model
public function setMenu()
{
$repoID = $this->session->repoID;
$projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
$projectID = isset($_GET['project']) ? $_GET['project'] : 0;
$moduleName = $this->app->getModuleName();
foreach($this->lang->{$moduleName}->menu as $key => $menu) common::setMenuVars($this->lang->{$moduleName}->menu, $key, $repoID);
$this->lang->{$moduleName}->menuOrder = $this->lang->ci->menuOrder;
if(!$projectID)
if(!$projectID)
{
$this->lang->navGroup->repo = 'repo';
$this->lang->navGroup->jenkins = 'repo';
@@ -58,7 +58,7 @@ class ciModel extends model
/**
* Sync compile status.
*
* @param object $compile
* @param object $compile
* @access public
* @return void
*/