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

module/execution/js/create.js

@@ -48,11 +48,22 @@ $(function()
     {
         if(systemMode == 'new')
         {
-            var maxWidth = $('.chosen-container .chosen-drop.chosen-auto-max-width.in').width() - 70;
+            $('#teams_chosen ul li').each(function(index)
+            {
+                if(index == 0)
+                {
+                    var maxWidth = $('.chosen-container .chosen-drop.chosen-auto-max-width.in').width() - 70;
 
-            $('#teams_chosen ul .label').remove();
-            $('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
-            $('#teams_chosen ul > li:first').attr('style', 'display: inline-block; vertical-align: middle; max-width: ' + maxWidth + 'px');
+                    $('#teams_chosen ul .label').remove();
+                    $(this).after(' <label class="label">' + projectCommon + '</label>');
+                    $(this).attr('style', 'display: inline-block; vertical-align: middle; max-width: ' + maxWidth + 'px');
+                }
+                else
+                {
+                    $(this).html($(this).html().replace('&nbsp;&nbsp;&nbsp;', ''));
+                    $(this).prepend('&nbsp;&nbsp;&nbsp;');
+                }
+            })
         }
     })
 

module/execution/model.php

@@ -2478,22 +2478,13 @@ class executionModel extends model
     {
         if(empty($projectID) and $this->config->systemMode == 'new') return array();
 
-        $objects = $this->dao->select('id,name,type')->from(TABLE_PROJECT)
+        $teamPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)
             ->where('deleted')->eq(0)
             ->andWhere('(project')->eq($projectID)
             ->orWhere('id')->eq($projectID)
             ->markRight(1)
             ->orderBy('project_asc')
-            ->fetchAll('id');
-
-        if(empty($objects)) return array();
-
-        $teamPairs = array();
-        foreach($objects as $id => $object)
-        {
-            $prefix = ($object->type != 'project' and $this->config->systemMode == 'new') ? '   ' : '';
-            $teamPairs[$id] = $prefix . $object->name;
-        }
+            ->fetchPairs();
 
         return $teamPairs;
     }

module/misc/css/features.css

@@ -10,8 +10,9 @@
 #featuresCarousel {padding: 0 50px;}
 #featuresCarousel .carousel-indicators {bottom: 0;}
 #featuresCarousel .carousel-indicators li {border-color: #d8d8d8; background-color: #d8d8d8; width: 12px; height: 12px;}
-#featuresCarousel .carousel-indicators li + li {margin-left: 10px;}
-#featuresCarousel .carousel-indicators .active {border-color: #73b1df; background-color: #73b1df; }
+#featuresCarousel .carousel-indicators li + li {margin-left: 10px !important;}
+#featuresCarousel .carousel-indicators .active {border-color: #73b1df; background-color: #73b1df; margin: 1px;}
+#featuresCarousel .carousel-inner .download-file {position: absolute; right: 95px; bottom: 0; font-size: 12px;}
 
 #features [data-slide-to] {pointer-events: none;}
 #features.enabled [data-slide-to] {pointer-events: auto;}

module/misc/view/features.html.php

@@ -25,7 +25,7 @@
           <video src="<?php echo $lang->install->guideVideo;?>" height="320px" controls ="controls"></video>
           <div class='text-center' style='position:relative'>
             <p><?php echo $lang->install->introduction;?></p>
-            <div style='position: absolute; right: 0; bottom: 0;'>
+            <div class='download-file'>
               <a href='https://dl.cnezsoft.com/zentao/zentaoconcept.pdf' target='_blank'><?php echo $lang->misc->feature->downloadFile;?></a>
             </div>
           </div>

module/story/control.php

@@ -576,7 +576,7 @@ class story extends control
                 $this->action->logHistory($actionID, $changes);
 
                 $story = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
-                $this->story->recordReviewAction($story);
+                if(isset($this->post->reviewer)) $this->story->recordReviewAction($story);
             }
 
             $this->executeHooks($storyID);

module/story/model.php

@@ -789,8 +789,8 @@ class storyModel extends model
 
         if(isset($_POST['reviewer']))
         {
-            $_POST['reviewer']   = array_filter($_POST['reviewer']);
-            $oldReviewer         = $this->getReviewerPairs($storyID, $oldStory->version);
+            $_POST['reviewer'] = array_filter($_POST['reviewer']);
+            $oldReviewer       = $this->getReviewerPairs($storyID, $oldStory->version);
             if(array_diff($_POST['reviewer'], array_keys($oldReviewer)) or array_diff(array_keys($oldReviewer), $_POST['reviewer']))
             {
                 /* Update story reviewer. */
@@ -4446,7 +4446,7 @@ class storyModel extends model
         {
             if($story->status == 'closed') $this->action->create('story', $story->id, 'ReviewRejected');
             if($story->status == 'active') $this->action->create('story', $story->id, 'ReviewPassed');
-            if(!array_diff(array_keys($reviewers), $reviewedBy) and ($story->status == 'draft' || $story->status == 'changed')) $this->action->create('story', $story->id, 'ReviewClarified');
+            if(!array_diff(array_keys($reviewers), $reviewedBy) and ($story->status == 'draft' or $story->status == 'changed')) $this->action->create('story', $story->id, 'ReviewClarified');
         }
 
         return $actionID;

module/task/js/editestimate.js

@@ -2,7 +2,7 @@
  * Confirm left.
  *
  * @access public
- * @return void
+ * @return bool
  */
 function confirmLeft()
 {

module/task/model.php

@@ -3068,7 +3068,7 @@ class taskModel extends model
                 echo $task->estStarted;
                 break;
             case 'realStarted':
-                echo $task->realStarted;
+                echo substr($task->realStarted, 5, 11);
                 break;
             case 'assignedTo':
                 $this->printAssignedHtml($task, $users);