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

module/bug/js/common.js

@@ -695,7 +695,7 @@ function loadExecutionBuilds(executionID, num)
     else
     {
         link = createLink('build', 'ajaxGetExecutionBuilds', 'executionID=' + executionID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&needCreate=false&type=normal&number=' + num);
-        $('#openedBuildBox' + num).load(link, function(){$(this).find('select').val(oldOpenedBuild).picker({optionRender: markReleaseBuilds})});
+        $('#openedBuildBox' + num).load(link, function(){$(this).find('select').val(oldOpenedBuild).picker({optionRender: markReleasedBuilds})});
 
         oldResolvedBuild = $('#resolvedBuild').val() ? $('#resolvedBuild').val() : 0;
         link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch);

module/common/model.php

@@ -535,6 +535,7 @@ class commonModel extends model
             echo "<a class='dropdown-toggle' data-toggle='dropdown'>";
             echo html::avatar($app->user);
             echo '</a>';
+            echo '<script>$("#userDropDownMenu").on("click", function(){$(this).removeClass("dropdown-hover");});$("#userDropDownMenu").on("hover", function(){$(this).next().removeClass("open");$(this).addClass("dropdown-hover");});</script>';
         }
     }
 

module/common/view/header.html.php

@@ -21,7 +21,7 @@ include 'chosen.html.php';
         <div id='userMenu'>
           <ul id="userNav" class="nav nav-default">
             <li class='dropdown dropdown-hover' id='globalCreate'><?php common::printCreateList();?></li>
-            <li class='dropdown dropdown-hover has-avatar'><?php common::printUserBar();?></li>
+            <li class='dropdown dropdown-hover has-avatar' id='userDropDownMenu'><?php common::printUserBar();?></li>
             <li class='dropdown dropdown-hover' id='visionSwitcher'><?php common::printVisionSwitcher();?></li>
           </ul>
         </div>

module/execution/control.php

@@ -3066,7 +3066,6 @@ class execution extends control
             /* Delete execution. */
             $execution = $this->execution->getByID($executionID);
             $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->eq($executionID)->exec();
-            $this->dao->update(TABLE_BUG)->set('execution')->eq(0)->where('execution')->eq($executionID)->exec();
             $this->loadModel('action')->create('execution', $executionID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
             $this->execution->updateUserView($executionID);
             $this->loadModel('common')->syncPPEStatus($executionID);

module/execution/js/kanban.js

@@ -1595,13 +1595,13 @@ $(function()
         return false;
     });
 
-    /* Mofidy dafault color's border color. */
+    /* Modify color's border color. */
     $(document).on('mouseout', '.color0', function()
     {
         $('.color0 .cardcolor').css('border', '1px solid #b0b0b0');
     });
 
-    /* Mofidy dafault color's border color. */
+    /* Modify default color's border color. */
     $(document).on('mouseover', '.color0', function()
     {
         $('.color0 .cardcolor').css('border', '1px solid #fff');

module/kanban/js/view.js

@@ -1631,13 +1631,13 @@ $(function()
         return false;
     });
 
-    /* Mofidy dafault color's border color. */
+    /* Modify default color's border color. */
     $(document).on('mouseout', '.color0', function()
     {
         $('.color0 .cardcolor').css('border', '1px solid #b0b0b0');
     });
 
-    /* Mofidy dafault color's border color. */
+    /* Modify default color's border color. */
     $(document).on('mouseover', '.color0', function()
     {
         $('.color0 .cardcolor').css('border', '1px solid #fff');

module/project/control.php

@@ -2044,7 +2044,6 @@ class project extends control
 
             /* Delete the execution under the project. */
             $executionIdList = $this->loadModel('execution')->getPairs($projectID);
-            $this->dao->update(TABLE_BUG)->set('execution')->eq(0)->where('execution')->in(array_keys($executionIdList))->exec();
 
             /* Delete shadow product.*/
             $project = $this->project->getByID($projectID);

module/task/control.php

@@ -471,9 +471,6 @@ class task extends control
         $modules       = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
 
         /* Set Custom*/
-        $project = $this->project->getByID($execution->project);
-        if($project->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
-
         foreach(explode(',', $this->config->task->customBatchCreateFields) as $field)
         {
             if($execution->type == 'stage' and strpos('estStarted,deadline', $field) !== false) continue;
@@ -780,9 +777,6 @@ class task extends control
         /* Set Custom*/
         if(isset($execution))
         {
-            $project = $this->project->getByID($execution->project);
-            if($project->model == 'waterfall') $this->config->task->edit->requiredFields .= ',estStarted,deadline';
-
             foreach(explode(',', $this->config->task->customBatchEditFields) as $field)
             {
                 if($execution->type == 'stage' and strpos('estStarted,deadline', $field) !== false) continue;

module/testtask/view/cases.html.php

@@ -20,8 +20,8 @@
 <?php js::set('automation',     !empty($automation) ? $automation->id : 0);?>
 <?php $this->app->loadLang('zanode');?>
 <?php js::set('runCaseConfirm', $lang->zanode->runCaseConfirm);?>
-<?php js::set('confirmURL',     $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=id_desc&from=testcase&taskID=$taskID&confirm=yes"));?>
-<?php js::set('cancelURL',      $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=id_desc&from=testcase&taskID=$taskID&confirm=no"));?>
+<?php js::set('confirmURL',     $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=id_desc&from=testtask&taskID=$taskID&confirm=yes"));?>
+<?php js::set('cancelURL',      $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=id_desc&from=testtask&taskID=$taskID&confirm=no"));?>
 <div id='mainContent' class='main-row fade'>
   <div class='side-col' id='sidebar'>
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>