Merge branch 'sprint/master_zhouxudong_59527' into 'master'

Sprint/master zhouxudong 59527

See merge request easycorp/zentaopms!4326

module/bug/css/edit.css

@@ -6,3 +6,4 @@
 #linkBugBox > li {margin-left: -56px;}
 #branch {width: 95px;}
 #storyIdBox .chosen-auto-max-width {width: 215px !important;}
+.form-group {margin-left: 10px; margin-right: 10px;}

module/bug/model.php

@@ -3195,7 +3195,7 @@ class bugModel extends model
                 echo zget($users, $bug->openedBy);
                 break;
             case 'openedDate':
-                echo substr($bug->openedDate, 5, 11);
+                echo helper::isZeroDate($bug->openedDate) ? '' : substr($bug->openedDate, 5, 11);
                 break;
             case 'openedBuild':
                 $builds = array_flip($builds);
@@ -3216,10 +3216,10 @@ class bugModel extends model
                 $this->printAssignedHtml($bug, $users);
                 break;
             case 'assignedDate':
-                echo substr($bug->assignedDate, 5, 11);
+                echo helper::isZeroDate($bug->assignedDate) ? '' : substr($bug->assignedDate, 5, 11);
                 break;
             case 'deadline':
-                echo $bug->deadline;
+                echo helper::isZeroDate($bug->deadline) ? '' : substr($bug->deadline, 5, 11);
                 break;
             case 'resolvedBy':
                 echo zget($users, $bug->resolvedBy, $bug->resolvedBy);
@@ -3228,7 +3228,7 @@ class bugModel extends model
                 echo zget($this->lang->bug->resolutionList, $bug->resolution);
                 break;
             case 'resolvedDate':
-                echo substr($bug->resolvedDate, 5, 11);
+                echo helper::isZeroDate($bug->resolvedDate) ? '' : substr($bug->resolvedDate, 5, 11);
                 break;
             case 'resolvedBuild':
                 echo $bug->resolvedBuild;
@@ -3237,13 +3237,13 @@ class bugModel extends model
                 echo zget($users, $bug->closedBy);
                 break;
             case 'closedDate':
-                echo substr($bug->closedDate, 5, 11);
+                echo helper::isZeroDate($bug->closedDate) ? '' : substr($bug->closedDate, 5, 11);
                 break;
             case 'lastEditedBy':
                 echo zget($users, $bug->lastEditedBy);
                 break;
             case 'lastEditedDate':
-                echo substr($bug->lastEditedDate, 5, 11);
+                echo helper::isZeroDate($bug->lastEditedDate) ? '' : substr($bug->lastEditedDate, 5, 11);
                 break;
             case 'actions':
                 echo $this->buildOperateMenu($bug, 'browse');

module/bug/view/batchedit.html.php

@@ -131,7 +131,7 @@
             }
             ?>
             <td class='<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$bugID]", $assignedToList, $bug->assignedTo, "class='form-control picker-select' data-drop-width='135px'");?></td>
-            <td class='<?php echo zget($visibleFields, 'deadline', ' hidden')?>' style='overflow:visible'><?php echo html::input("deadlines[$bugID]", $bug->deadline, "class='form-control form-date'");?></td>
+            <td class='<?php echo zget($visibleFields, 'deadline', ' hidden')?>' style='overflow:visible'><?php echo html::input("deadlines[$bugID]", helper::isZeroDate($bug->deadline) ? '' : substr($bug->deadline, 5, 11), "class='form-control form-date'");?></td>
             <td <?php echo zget($visibleFields, 'os', "class='hidden'")?>><?php echo html::select("os[$bugID]", $osList, $bug->os, 'class=form-control');?></td>
             <td <?php echo zget($visibleFields, 'browser', "class='hidden'")?>><?php echo html::select("browsers[$bugID]", $browserList, $bug->browser, 'class=form-control');?></td>
             <td <?php echo zget($visibleFields, 'keywords', "class='hidden'")?>><?php echo html::input("keywords[$bugID]", $bug->keywords, 'class=form-control');?></td>

module/bug/view/edit.html.php

@@ -160,7 +160,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->deadline;?></th>
-                  <td><?php echo html::input('deadline', $bug->deadline, "class='form-control form-date'");?></td>
+                  <td><?php echo html::input('deadline', helper::isZeroDate($bug->deadline) ? '' : substr($bug->deadline, 5, 11), "class='form-control form-date'");?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->feedbackBy;?></th>

module/bug/view/view.html.php

@@ -224,7 +224,7 @@
                   <th><?php echo $lang->bug->deadline;?></th>
                   <td>
                     <?php
-                    if($bug->deadline) echo $bug->deadline;
+                    if($bug->deadline) echo helper::isZeroDate($bug->deadline) ? '' : substr($bug->deadline, 5, 11);
                     if(isset($bug->delay)) printf($lang->bug->delayWarning, $bug->delay);
                     ?>
                   </td>