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-25 11:33:33 +08:00
parent c8d6bc2333 6e3bef7090
commit 33c8b4370c
5 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
db/zentao.sql
View File

File diff suppressed because one or more lines are too long

23
module/api/control.php
View File

@@ -618,10 +618,11 @@ class api extends control
* *
* @param int $libID * @param int $libID
* @param int $moduleID * @param int $moduleID
* @param string $space api|project|product
* @access public * @access public
* @return void * @return void
*/ */
public function create($libID, $moduleID = 0) public function create($libID, $moduleID = 0, $space = '')
{ {
if(!empty($_POST)) if(!empty($_POST))
{ {
@@ -637,7 +638,7 @@ class api extends control
$libs = $this->doc->getLibs('api', '', $libID); $libs = $this->doc->getLibs('api', '', $libID);
if(!$libID and !empty($libs)) $libID = key($libs); if(!$libID and !empty($libs)) $libID = key($libs);
$this->setMenu($libID); $this->setMenu($libID, $space);
$lib = $this->doc->getLibByID($libID); $lib = $this->doc->getLibByID($libID);
$libName = isset($lib->name) ? $lib->name . $this->lang->colon : ''; $libName = isset($lib->name) ? $lib->name . $this->lang->colon : '';
@@ -758,11 +759,13 @@ class api extends control
* Set api menu by method name. * Set api menu by method name.
* *
* @param int $libID * @param int $libID
* @param string $space |null|api|project|product
* @access public * @access public
* @return void * @return void
*/ */
private function setMenu($libID = 0) private function setMenu($libID = 0, $space = '')
{ {
if($space and strpos('|api|project|product|', "|{$space}|") === false) $space = '';
common::setMenuVars('doc', ''); common::setMenuVars('doc', '');
$lib = $this->loadModel('doc')->getLibByID($libID); $lib = $this->loadModel('doc')->getLibByID($libID);
@@ -775,14 +778,22 @@ class api extends control
$this->loadModel('project')->setMenu($lib->project); $this->loadModel('project')->setMenu($lib->project);
} }
if(in_array($this->session->spaceType, array('product', 'project'))) $spaceType = $this->session->spaceType;
if(empty($spaceType)) $spaceType = 'api';
if($space)
{
$spaceType = $space;
$this->session->set('spaceType', $space, 'doc');
}
if(in_array($spaceType, array('product', 'project')))
{ {
$this->lang->doc->menu->api['exclude'] = 'api-' . $this->app->rawMethod . ',' . $this->app->rawMethod; $this->lang->doc->menu->api['exclude'] = 'api-' . $this->app->rawMethod . ',' . $this->app->rawMethod;
$this->lang->doc->menu->{$this->session->spaceType}['subModule'] = 'api'; $this->lang->doc->menu->{$spaceType}['subModule'] = 'api';
} }
else else
{ {
$this->lang->doc->menu->{$this->session->spaceType}['alias'] .= ',' . $this->app->rawMethod; $this->lang->doc->menu->{$spaceType}['alias'] .= ',' . $this->app->rawMethod;
} }
} }

2
module/caselib/model.php
View File

@@ -183,7 +183,7 @@ class caselibModel extends model
$lib = fixer::input('post') $lib = fixer::input('post')
->stripTags($this->config->caselib->editor->create['id'], $this->config->allowedTags) ->stripTags($this->config->caselib->editor->create['id'], $this->config->allowedTags)
->setForce('type', 'library') ->setForce('type', 'library')
->setIF($this->lang->navGroup->caselib != 'qa', 'project', $this->session->project) ->setIF($this->lang->navGroup->caselib != 'qa', 'project', (int)$this->session->project)
->add('addedBy', $this->app->user->account) ->add('addedBy', $this->app->user->account)
->add('addedDate', helper::now()) ->add('addedDate', helper::now())
->remove('uid') ->remove('uid')

2
module/doc/js/selectlibtype.js
View File

@@ -14,7 +14,7 @@ function redirectParentWindow(objectType, libID, moduleID, docType)
var link = ''; var link = '';
if(docType == 'api') if(docType == 'api')
{ {
link = createLink('api', 'create', 'libID=' + libID + '&moduleID=' + moduleID); link = createLink('api', 'create', 'libID=' + libID + '&moduleID=' + moduleID + '&space=' + objectType);
} }
else else
{ {

2
module/task/control.php
View File

@@ -983,7 +983,7 @@ class task extends control
$story = $this->story->getById($task->story, $task->storyVersion); $story = $this->story->getById($task->story, $task->storyVersion);
$task->storySpec = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->spec); $task->storySpec = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->spec);
$task->storyVerify = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->verify); $task->storyVerify = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->verify);
$task->storyFiles = empty($story) ? '' : $story->files; $task->storyFiles = zget($story, 'files', array());
} }
if($task->team) $this->lang->task->assign = $this->lang->task->transfer; if($task->team) $this->lang->task->assign = $this->lang->task->transfer;