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

module/doc/model.php

@@ -2305,7 +2305,7 @@ EOT;
             if($libID == 0) $libID = key($libs);
             $this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID);
 
-            $this->app->rawMethod = $type;
+            if($this->app->openApp == 'doc') $this->app->rawMethod = $type;
 
             $object = $this->dao->select('id,name,status')->from($table)->where('id')->eq($objectID)->fetch();
             if(empty($object)) die(js::locate(helper::createLink($type, 'create')));

module/execution/model.php

@@ -1300,7 +1300,10 @@ class executionModel extends model
             $link = helper::createLink($module, $method, "executionID=%s");
         }
 
-        if($module == 'doc') $link = helper::createLink('doc', 'objectLibs', "type=execution&objectID=%s&from=execution");
+        if($module == 'doc')
+        {
+            $link = helper::createLink('doc', $method, "type=execution&objectID=%s&from=execution");
+        }
         return $link;
     }
 

module/gitlab/view/browse.html.php

@@ -42,7 +42,7 @@
         <?php foreach ($gitlabList as $id => $gitlab): ?>
         <tr>
           <td class='text-center'><?php echo $id;?></td>
-          <td class='text' title='<?php echo $gitlab->name;?>'><?php echo $gitlab->name;?></td>
+          <td class='text c-name' title='<?php echo $gitlab->name;?>'><?php echo $gitlab->name;?></td>
           <td class='text' title='<?php echo $gitlab->url;?>'><?php echo $gitlab->url;?></td>
           <td class='c-actions text-left'>
             <?php

module/job/model.php

@@ -203,6 +203,23 @@ class jobModel extends model
             ->add('editedDate', helper::now())
             ->remove('repoType')
             ->get();
+
+        if($job->engine == 'jenkins')
+        {
+            $job->server   = $job->jkServer;
+            $job->pipeline = $job->jkTask;
+        }
+
+        if(strtolower($job->engine) == 'gitlab')
+        {
+            $repo          = $this->loadModel('repo')->getRepoByID($job->repo);
+            $job->server   = $repo->gitlab;
+            $job->pipeline = $repo->project;
+        }
+
+        unset($job->jkServer);
+        unset($job->jkTask);
+
         if($job->triggerType == 'schedule') $job->atDay = empty($_POST['atDay']) ? '' : join(',', $this->post->atDay);
 
         $job->svnDir = '';

module/product/model.php

@@ -1785,7 +1785,7 @@ class productModel extends model
         }
         else if($module == 'doc')
         {
-            $link = helper::createLink('doc', 'objectLibs', "type=product&objectID=%s&from=product");
+            $link = helper::createLink('doc', $method, "type=product&objectID=%s&from=product");
         }
         elseif($module == 'design')
         {

module/repo/view/maintain.html.php

@@ -41,7 +41,11 @@
           $productList = explode(',', str_replace(' ', '', $repo->product));
           if(isset($productList) and $productList[0])
           {
-              foreach($productList as $productID) echo ' ' . html::a($this->createLink('product', 'browse', "productID=$productID"), zget($products, $productID, $productID));
+              foreach($productList as $productID)
+              {
+                  if(!isset($products[$productID])) continue;
+                  echo ' ' . html::a($this->createLink('product', 'browse', "productID=$productID"), zget($products, $productID, $productID));
+              }
           }
           ?>
           </td>