From c7c113de3f534d70479b348ae5fb6e2796586d7e Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 9 Apr 2021 11:03:49 +0800
Subject: [PATCH] * Merge code.

---
 module/execution/view/all.html.php | 12 ++++++------
 module/story/view/view.html.php    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 4f3d659ee6..dca697c217 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -68,11 +68,11 @@
           </th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?></th>
           <th class='thWidth'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->execution->owner);?></th>
-          <th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
-          <th class='w-100px'><?php common::printOrderLink('status', $orderBy, $vars, $from == 'execution' ? $lang->execution->execStatus : $lang->execution->status);?></th>
-          <th class='w-80px hours text-right'><?php echo $lang->execution->totalEstimate;?></th>
-          <th class='w-80px hours text-right'><?php echo $lang->execution->totalConsumed;?></th>
-          <th class='w-80px hours text-right'><?php echo $lang->execution->totalLeft;?></th>
+          <th class='w-80px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
+          <th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $from == 'execution' ? $lang->execution->execStatus : $lang->execution->status);?></th>
+          <th class='w-70px text-center'><?php echo $lang->execution->totalEstimate;?></th>
+          <th class='w-70px text-center'><?php echo $lang->execution->totalConsumed;?></th>
+          <th class='w-70px text-center'><?php echo $lang->execution->totalLeft;?></th>
           <th class='w-60px'><?php echo $lang->execution->progress;?></th>
           <th class='w-100px'><?php echo $lang->execution->burn;?></th>
         </tr>
@@ -101,7 +101,7 @@
           <td><?php echo zget($users, $execution->PM);?></td>
           <td><?php echo $execution->end;?></td>
           <?php $executionStatus = $this->processStatus('execution', $execution);?>
-          <td class='c-status' title='<?php echo $executionStatus;?>'>
+          <td class='c-status text-center' title='<?php echo $executionStatus;?>'>
             <span class="status-execution status-<?php echo $execution->status?>"><?php echo $executionStatus;?></span>
           </td>
           <td class='hours' title='<?php echo $execution->hours->totalEstimate . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalEstimate . $this->lang->execution->workHourUnit;?></td>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 9ca55b1b54..86b8a59025 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -49,7 +49,7 @@
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('product', $product)): ?>
     <?php
-    $otherParam = '';
+    $otherParam = 'storyID=&projectID=';
     $openApp    = 'product';
     if($this->app->rawModule == 'projectstory')
     {
@@ -57,7 +57,7 @@
         $openGroup  = 'project';
     }
     ?>
-    <?php common::printLink('story', 'create', "productID={$story->product}&branch={$story->branch}&moduleID={$story->module}&$otherParam", "<i class='icon icon-plus'></i>" . $lang->story->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
+    <?php common::printLink('story', 'create', "productID={$story->product}&branch={$story->branch}&moduleID={$story->module}&$otherParam&bugID=0&planID=0&todoID=0&extra=&type=$story->type", "<i class='icon icon-plus'></i>" . $lang->story->create, '', "class='btn btn-primary' data-app='$openApp'"); ?>
     <?php endif;?>
   </div>
   <?php endif;?>