Merge branch 'master_xieqiyu_27124' into 'master'

Master xieqiyu 27124

See merge request easycorp/zentaopms!5300

extension/lite/story/ext/view/view.html.php

@@ -110,7 +110,7 @@
                   common::printIcon('story', 'change', "storyID=$child->id", $child, 'list', 'alter');
                   if(strpos('draft,changing', $child->status) !== false)
                   {
-                      common::printIcon('story', 'submitReview', "storyID=$child->id", $child, 'list', 'sub-review', '', 'iframe showinonlybody', true);
+                      common::printIcon('story', 'submitReview', "storyID=$child->id", $child, 'list', 'confirm', '', 'iframe showinonlybody', true);
                   }
                   else
                   {
@@ -143,7 +143,7 @@
         common::printIcon('story', 'change', "storyID=$story->id", $story, 'button', 'alter', '', 'showinonlybody');
         if(strpos('draft,changing', $story->status) !== false)
         {
-            common::printIcon('story', 'submitReview', "storyID=$story->id", $story, 'button', 'sub-review', '', 'iframe showinonlybody', true);
+            common::printIcon('story', 'submitReview', "storyID=$story->id", $story, 'button', 'confirm', '', 'iframe showinonlybody', true);
         }
         else
         {

module/bug/control.php

@@ -525,7 +525,7 @@ class bug extends control
             $severity    = $bug->severity;
             $type        = $bug->type;
             $assignedTo  = $bug->assignedTo;
-            $deadline    = $bug->deadline;
+            $deadline    = helper::isZeroDate($bug->deadline) ? '' : $bug->deadline;
             $color       = $bug->color;
             $testtask    = $bug->testtask;
             if($pri == 0) $pri = '3';

module/bug/model.php

@@ -3279,7 +3279,7 @@ class bugModel extends model
                     $title = "title='" . zget($projectPairs, $bug->project, '') . "'";
                     break;
                 case 'plan':
-                    $title = "title='" . zget($plans, $bug->plan) . "'";
+                    $title = "title='" . zget($plans, $bug->plan, '') . "'";
                     break;
                 case 'execution':
                     $title = "title='" . zget($executions, $bug->execution) . "'";

module/build/view/linkstory.html.php

@@ -47,7 +47,7 @@
           <td><span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
           <td class='text-left nobr' title='<?php echo $story->title?>'>
             <?php
-            if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
+            if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
             echo html::a($this->createLink('story', 'view', "storyID=$story->id&version=0&param=$objectID", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");
             ?>
           </td>

module/build/view/view.html.php

@@ -103,7 +103,7 @@ tbody tr td:first-child input {display: none;}
                 <td><span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
                 <td class='text-left nobr' title='<?php echo $story->title?>'>
                   <?php
-                  if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
+                  if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
                   if($this->app->tab == 'execution' and common::hasPriv('execution', 'storyView'))
                   {
                       echo html::a($this->createLink('execution', 'storyView', "storyID=$story->id", '', true), $story->title, '', isonlybody() ? "data-width='1000'" : "class='iframe' data-width='1000'");

module/execution/view/linkstory.html.php

@@ -66,7 +66,7 @@
         <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
         <td class='text-left nobr' title="<?php echo $story->title?>">
           <?php
-          if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
+          if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
           if(common::hasPriv('execution', 'storyView'))
           {
               echo html::a($storyLink, $story->title, '', "class='iframe' data-width='80%'");

module/my/view/requirement.html.php

@@ -107,7 +107,7 @@
 
                 if(strpos('draft,changing', $story->status) !== false)
                 {
-                    echo common::buildIconButton('story', 'submitReview', "$vars&storyType=requirement", $story, 'list', 'sub-review', '', 'iframe', true);
+                    echo common::buildIconButton('story', 'submitReview', "$vars&storyType=requirement", $story, 'list', 'confirm', '', 'iframe', true);
                 }
                 else
                 {
@@ -155,7 +155,7 @@
 
                     if(strpos('draft,changing', $child->status) !== false)
                     {
-                        common::printIcon('story', 'submitReview', "$vars&storyType=story", $child, 'list', 'sub-review', '', 'iframe', true);
+                        common::printIcon('story', 'submitReview', "$vars&storyType=story", $child, 'list', 'confirm', '', 'iframe', true);
                     }
                     else
                     {

module/my/view/story.html.php

@@ -108,7 +108,7 @@
 
                 if(strpos('draft,changing', $story->status) !== false)
                 {
-                    echo common::buildIconButton('story', 'submitReview', $vars, $story, 'list', 'sub-review', '', 'iframe', true);
+                    echo common::buildIconButton('story', 'submitReview', $vars, $story, 'list', 'confirm', 'confirm', 'iframe', true);
                 }
                 else
                 {
@@ -158,7 +158,7 @@
 
                 if(strpos('draft,changing', $child->status) !== false)
                 {
-                    common::printIcon('story', 'submitReview', $vars, $child, 'list', 'sub-review', '', 'iframe', true);
+                    common::printIcon('story', 'submitReview', $vars, $child, 'list', 'confirm', '', 'iframe', true);
                 }
                 else
                 {

module/product/view/ajaxgetdropmenu.html.php

@@ -26,7 +26,7 @@
 #swapper .tree li>.list-toggle {top: -1px;}
 
 #subHeader .tree ul {display: block;}
-#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
+div#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
 #gray-line {width: 230px; height: 1px; margin-left: 10px; margin-bottom:2px; background-color: #ddd;}
 #swapper li >.selected {color: #0c64eb!important;background: #e9f2fb!important;}
 </style>

module/projectrelease/view/linkstory.html.php

@@ -50,7 +50,7 @@
           <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
           <td class='text-left nobr c-name' title='<?php echo $story->title?>'>
             <?php
-            if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
+            if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
             echo html::a($this->createLink('story', 'view', "storyID={$story->id}&version=0&param=$projectID", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");
             ?>
           </td>

module/projectrelease/view/view.html.php

@@ -94,7 +94,7 @@
                     <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
                     <td class='text-left nobr' title='<?php echo $story->title?>'>
                       <?php
-                      if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
+                      if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
                       echo html::a($storyLink,$story->title, '', "class='preview'");
                       ?>
                     </td>

module/story/control.php

@@ -1858,11 +1858,18 @@ class story extends control
         $storyGroup = array();
         foreach($stories as $story)
         {
-            if(strpos('draft,reviewing,changing,closed', $story->status) !== false) continue;
+            if(strpos('draft,reviewing,changing,closed', $story->status) !== false)
+            {
+                unset($stories[$story->id]);
+                continue;
+            }
+
             if(isset($storyGroup[$story->module])) continue;
             $storyGroup[$story->module] = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $story->module, 'short', 'active');
         }
 
+        if(empty($stories)) return print(js::error($this->lang->story->noStoryToTask) . js::locate($this->session->storyList));
+
         $this->view->title          = $this->lang->story->batchToTask;
         $this->view->executionID    = $executionID;
         $this->view->syncFields     = empty($_POST['fields']) ? array() : $_POST['fields'];

module/story/lang/de.php

@@ -307,6 +307,7 @@ $lang->story->confirmChangePlan    = $lang->SRCommon . ' %s is linked to the bra
 $lang->story->errorDuplicateStory  = $lang->SRCommon . '%s not exist';
 $lang->story->confirmRecallChange  = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
 $lang->story->confirmRecallReview  = "Are you sure you want to withdraw the review?";
+$lang->story->noStoryToTask        = "Only the activated {$lang->SRCommon} can be converted into a task!";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Story Bereich';

module/story/lang/en.php

@@ -307,6 +307,7 @@ $lang->story->confirmChangePlan    = $lang->SRCommon . ' %s is linked to the bra
 $lang->story->errorDuplicateStory  = $lang->SRCommon . '%s not exist';
 $lang->story->confirmRecallChange  = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
 $lang->story->confirmRecallReview  = "Are you sure you want to withdraw the review?";
+$lang->story->noStoryToTask        = "Only the activated {$lang->SRCommon} can be converted into a task!";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Scope';

module/story/lang/fr.php

@@ -307,6 +307,7 @@ $lang->story->confirmChangePlan    = $lang->SRCommon . ' %s is linked to the bra
 $lang->story->errorDuplicateStory  = $lang->SRCommon . '%s not exist';
 $lang->story->confirmRecallChange  = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
 $lang->story->confirmRecallReview  = "Are you sure you want to withdraw the review?";
+$lang->story->noStoryToTask        = "Only the activated {$lang->SRCommon} can be converted into a task!";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Périmètre';

module/story/lang/vi.php

@@ -299,6 +299,7 @@ $lang->story->confirmChangePlan    = $lang->SRCommon . ' %s is linked to the bra
 $lang->story->errorDuplicateStory  = $lang->SRCommon . '%s not exist';
 $lang->story->confirmRecallChange  = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
 $lang->story->confirmRecallReview  = "Are you sure you want to withdraw the review?";
+$lang->story->noStoryToTask        = "Only the activated {$lang->SRCommon} can be converted into a task!";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Phạm vi';

module/story/lang/zh-cn.php

@@ -307,6 +307,7 @@ $lang->story->confirmChangePlan     = $lang->SRCommon . '%s已关联在之前计
 $lang->story->errorDuplicateStory   = $lang->SRCommon . '%s不存在';
 $lang->story->confirmRecallChange   = "撤销变更后，需求内容会回退至变更前的版本，您确定要撤销吗？";
 $lang->story->confirmRecallReview   = "您确定要撤回评审吗？";
+$lang->story->noStoryToTask         = "只有激活的{$lang->SRCommon}才能转为任务！";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area     = "该{$lang->SRCommon}所属范围";

module/story/view/create.html.php

@@ -11,9 +11,6 @@
  */
 ?>
 <?php include './header.html.php';?>
-<style>
-#product_chosen {border-right:1px solid #dcdcdc;}
-</style>
 <?php js::set('page', 'create');?>
 <?php js::set('holders', $lang->story->placeholder); ?>
 <?php js::set('blockID', $blockID); ?>

module/task/control.php

@@ -230,7 +230,7 @@ class task extends control
             elseif($this->post->after == 'toTaskList')
             {
                 setcookie('moduleBrowseParam',  0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
-                $taskLink  = $this->createLink('execution', 'task', "executionID=$executionID&status=all&param=0&orderBy=id_desc");
+                $taskLink  = $this->createLink('execution', 'task', "executionID=$executionID&status=unclosed&param=0&orderBy=id_desc");
                 $response['locate'] = $taskLink;
                 return $this->send($response);
             }