Merge branch 'sprint/247_wzm_28406' into 'master'

* fix 247 bug

See merge request easycorp/zentaopms!5724

module/execution/css/task.css

@@ -11,3 +11,4 @@
 #datatable-taskList .c-progress{padding-right: 8px; text-align: right;}
 .c-finishedBy, .c-lastEditedBy {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 #executionTaskForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
+#executionTaskForm table thead th[data-width="auto"] {width: unset;}

module/execution/view/testtask.html.php

@@ -61,10 +61,10 @@
           </th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
           <th><?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
+          <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
           <th class='c-user'><?php common::printOrderLink('owner', $orderBy, $vars, $lang->testtask->owner);?></th>
           <th class='c-date'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
           <th class='c-date'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
-          <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
           <th class='c-actions-5 text-center'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
@@ -88,13 +88,13 @@
           </td>
           <td class='text-left' title="<?php echo $task->name?>"><?php echo html::a($this->createLink('testtask', 'cases', "taskID=$task->id"), $task->name, '', "data-app='execution'");?></td>
           <td title="<?php echo $task->buildName?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName);?></td>
-          <td><?php echo zget($users, $task->owner);?></td>
-          <td><?php echo $task->begin?></td>
-          <td><?php echo $task->end?></td>
           <?php $status = $this->processStatus('testtask', $task);?>
           <td title='<?php echo $status;?>'>
             <span class='status-testtask status-<?php echo $task->status?>'><?php echo $status;?></span>
           </td>
+          <td><?php echo zget($users, $task->owner);?></td>
+          <td><?php echo $task->begin?></td>
+          <td><?php echo $task->end?></td>
           <td class='c-actions'>
             <?php
             if($canBeChanged)

module/my/js/story.js

@@ -7,7 +7,7 @@ $(function()
         if($td.find('.label').length > 0) labelWidth = $td.find('.label').width();
         $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60);
     });
-
+    toggleFold('#myStoryForm', [], 0, 'story');
     $(document).on('click', '.story-toggle', function(e)
     {
         var $toggle = $(this);

module/my/view/story.html.php

@@ -84,7 +84,7 @@
         $storyLink    = $this->createLink('story', 'view', "id=$story->id");
         $canBeChanged = common::canBeChanged('story', $story);
         ?>
-        <tr>
+        <tr data-id='<?php echo $story->id?>'>
           <td class="c-id">
             <?php if($canBatchAction):?>
             <div class="checkbox-primary">

module/my/view/testtask.html.php

@@ -50,7 +50,7 @@
         <td class='text-left nobr' title='<?php echo $task->name;?>'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
         <td class='nobr' title='<?php echo $task->build == 'trunk' ? $lang->trunk : $task->buildName;?>'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
         <td class='nobr' title='<?php echo $task->executionName;?>'><?php echo $task->executionName;?></td>
-        <td title='<?php echo $this->processStatus('testtask', $task);?>'><span class="status-task status-<?php echo $task->status?>"><?php echo $this->processStatus('testtask', $task);?></span></td>
+        <td title='<?php echo $this->processStatus('testtask', $task);?>'><span class="status-task status-<?php echo $task->status;?>"><?php echo $this->processStatus('testtask', $task);?></span></td>
         <td><?php echo $task->begin?></td>
         <td><?php echo $task->end?></td>
         <td class='c-actions'>

module/product/view/browse.html.php

@@ -41,7 +41,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
 .btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;}
 .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
-
+#productStoryForm table thead th[data-width="auto"] {width: unset;}
 #productStoryForm table tbody tr td.c-actions {overflow: visible;}
 #productStoryForm table tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
 </style>

module/project/css/execution.css

@@ -1,5 +1,5 @@
-#executionList > thead > tr > th .table-nest-toggle-global {top: 4px;}
-#executionList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;}
+#executionList > thead > tr > th .table-nest-toggle-global {position: static!important;}
+#executionList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8; position: static!important;}
 #executionsSummary {padding-left: 10px;}
 #mainMenu .pull-left .checkbox-primary {margin-top: 5px;}
 .main-table tbody>tr>td:first-child, .main-table thead>tr>th:first-child { padding-left: 8px; }

module/project/view/execution.html.php

@@ -72,10 +72,12 @@
       <thead>
         <tr>
           <th class='table-nest-title'>
-          <?php if($canBatchEdit and $showToggleIcon):?>
-            <a class='table-nest-toggle icon table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse;?>'></a>
-          <?php endif;?>
-          <?php echo $lang->nameAB;?>
+            <div class="flex-between">
+              <?php echo $lang->nameAB;?>
+              <?php if($canBatchEdit and $showToggleIcon):?>
+                <a class='table-nest-toggle icon table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse;?>'></a>
+              <?php endif;?>
+            </div>
           </th>
           <th class='c-user'><?php echo $lang->execution->owner;?></th>
           <th class='c-status text-center'><?php echo $lang->project->status;?></th>