From d38280e257acffabb7726e398a9d80ca549bc4cb Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Wed, 7 Jul 2021 10:47:45 +0800
Subject: [PATCH] * Fix bug #13518.

---
 module/execution/view/storyestimate.html.php | 2 +-
 module/story/model.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/storyestimate.html.php b/module/execution/view/storyestimate.html.php
index 6dd16183d4..0447371093 100644
--- a/module/execution/view/storyestimate.html.php
+++ b/module/execution/view/storyestimate.html.php
@@ -54,7 +54,7 @@
           <td><?php echo zget($users, $user->account);?></td>
           <?php echo html::hidden('account[]', $user->account, "class='form-control'");?>
           <?php if(!empty($estimateInfo->estimate)):?>
-          <td><?php echo isset($estimateInfo->estimate->{$user->account}) ? $estimateInfo->estimate->{$user->account}->estimate : '';?></td>
+          <td class='c-name' title="<?php echo isset($estimateInfo->estimate->{$user->account}) ? $estimateInfo->estimate->{$user->account}->estimate : '';?>"><?php echo isset($estimateInfo->estimate->{$user->account}) ? $estimateInfo->estimate->{$user->account}->estimate : '';?></td>
           <td class='new-estimate hide'><?php echo html::input('estimate[]', '', "class='form-control'");?></td>
           <?php else:?>
           <td class='new-estimate'><?php echo html::input('estimate[]', '', "class='form-control'");?></td>
diff --git a/module/story/model.php b/module/story/model.php
index 6209f72b10..2ab5feeae3 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4165,7 +4165,7 @@ class storyModel extends model
                 dao::$errors[] = $this->lang->story->estimateMustBePlus;
                 return false;
             }
-            $estimates[$account]['estimate'] = (int)$data->estimate[$key];
+            $estimates[$account]['estimate'] = strpos($data->estimate[$key], '-') !== false ? (int)$data->estimate[$key] : $data->estimate[$key];
         }