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

Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4

Browse Source
This commit is contained in:
wangyidong
2023-04-24 21:01:04 +08:00
parent 076dcc7364 18f0a9e65c
commit e7aa31d68e
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/api/control.php
+2 -2
View File
@@ -167,7 +167,7 @@ class api extends control
if(!strpos($this->server->http_referer, 'space') and !strpos($this->server->http_referer, 'api')) setCookie("docSpaceParam", '', $this->config->cookieLife, $this->config->webRoot, '', false, true);
/* Get all api doc libraries. */
$libs = $this->doc->getApiLibs($libID);
$libs = $this->doc->getApiLibs($libID, $this->objectType, $this->objectID);
$api = $this->api->getLibById($apiID, $version, $release);
if($api)
{
@@ -183,7 +183,7 @@ class api extends control
}
/* Crumbs links array. */
$lib = zget($libs, $libID);
$lib = zget($libs, $libID);
$type = $lib->product ? 'product' : ($lib->project ? 'project' : 'unlink');
$methodName = $type != 'unlink' ? $type . 'Space' : 'index';
module/doc/model.php
+2 -2
View File
@@ -47,13 +47,13 @@ class docModel extends model
$libs = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('deleted')->eq(0)
->andWhere('type')->eq('api')
->beginIF(!empty($appendLib))->orWhere('id')->eq($appendLib)->fi()
->beginIF(!empty($objectType) && $objectID > 0 and $objectType != 'nolink')->andWhere($objectType)->eq($objectID)->fi()
->beginIF(!empty($objectType) and $objectID > 0 and $objectType != 'nolink')->andWhere($objectType)->eq($objectID)->fi()
->beginIF($objectType == 'nolink')
->andWhere('product')->eq(0)
->andWhere('project')->eq(0)
->andWhere('execution')->eq(0)
->fi()
->beginIF(!empty($appendLib))->orWhere('id')->eq($appendLib)->fi()
->orderBy('order_asc, id_asc')
->fetchAll('id');
module/project/model.php
+2
View File
@@ -139,6 +139,8 @@ class projectModel extends model
}
}
setcookie('lastProject', (int)$this->session->project, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
return $this->session->project;
}
module/upgrade/model.php
+2 -1
View File
@@ -9127,12 +9127,13 @@ class upgradeModel extends model
if(!$sql) return array();
$this->loadModel('dataview');
$this->loadModel('chart');
$columns = $this->dataview->getColumns($sql);
$columnFields = array();
foreach($columns as $column => $type) $columnFields[$column] = $column;
$tableAndFields = $this->dataview->getTables($sql);
$tableAndFields = $this->chart->getTables($sql);
$tables = $tableAndFields['tables'];
$fields = $tableAndFields['fields'];