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

module/api/control.php

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

module/caselib/model.php

@@ -183,7 +183,7 @@ class caselibModel extends model
         $lib = fixer::input('post')
             ->stripTags($this->config->caselib->editor->create['id'], $this->config->allowedTags)
             ->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('addedDate', helper::now())
             ->remove('uid')

module/doc/js/selectlibtype.js

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

module/task/control.php

@@ -983,7 +983,7 @@ class task extends control
             $story = $this->story->getById($task->story, $task->storyVersion);
             $task->storySpec   = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->spec);
             $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;