Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/doc/css/editlib.css

@@ -1,6 +1,4 @@
 form {margin-right: 30px;}
 
-.chosen-container .chosen-results {max-height: 180px;}
-
 #whiteListBox div.input-group {margin-bottom: 2px;}
 #whiteListBox .input-group:last-child {margin-top: 10px;}

module/doc/view/editlib.html.php

@@ -12,6 +12,11 @@
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
 <?php include '../../common/view/chosen.html.php';?>
+<?php if($lib->type == 'product'):?>
+<style> .chosen-container .chosen-results {max-height: 180px;}</style>
+<?php else:?>
+<style> .chosen-container .chosen-results {max-height: 145px;}</style>
+<?php endif;?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>

module/execution/model.php

@@ -1182,6 +1182,10 @@ class executionModel extends model
         {
             $link = helper::createLink('execution', $module, "executionID=%s");
         }
+        elseif($module == 'repo')
+        {
+            $link = helper::createLink('repo', 'browse', "repoID=0&branchID=&executionID=%s");
+        }
         else
         {
             $link = helper::createLink($module, $method, "executionID=%s");

module/project/control.php

@@ -173,6 +173,9 @@ class project extends control
     {
         $projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram());
 
+        if($projectID == 0 and common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'create'));
+        if($projectID == 0 and !common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'browse'));
+
         $this->project->setMenu($projectID);
 
         $project = $this->project->getByID($projectID);