From 7b7e6ca1e20806def78637ec0af839ce92bbd98c Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Sun, 7 Feb 2021 14:40:53 +0800
Subject: [PATCH] * Fix bug #10962.

---
 module/project/model.php               | 2 +-
 module/project/view/importbug.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index da47b1b2da..0b4137f247 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1984,7 +1984,7 @@ class projectModel extends model
                 return false;
             }
 
-            if(!preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $task->estimate))
+            if(!preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $task->estimate) and !empty($task->estimate))
             {
                 dao::$errors['message'][] = $this->lang->task->error->estimateNumber;
                 return false;
diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php
index edfa5f9cd5..1aa47e9e63 100755
--- a/module/project/view/importbug.html.php
+++ b/module/project/view/importbug.html.php
@@ -43,7 +43,7 @@ var browseType = '<?php echo $browseType;?>';
           <th class='w-100px <?php echo in_array('pri',        $requiredFields) ? 'required' : ''?>'><?php echo $lang->task->pri;?></th>
           <th class='w-150px <?php echo in_array('assignedTo', $requiredFields) ? 'required' : ''?>'><?php echo $lang->task->assignedTo;?></th>
           <th class='w-80px  <?php echo in_array('estimate',   $requiredFields) ? 'required' : ''?>'><?php echo $lang->task->estimate;?></th>
-          <th class='w-120px <?php echo in_array('deadline',   $requiredFields) ? 'required' : ''?>'><?php echo $lang->task->deadline;?></th>
+          <th class='w-150px <?php echo in_array('deadline',   $requiredFields) ? 'required' : ''?>'><?php echo $lang->task->deadline;?></th>
         </tr>
       </thead>
       <tbody>
@@ -73,7 +73,7 @@ var browseType = '<?php echo $browseType;?>';
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always">
-        <?php echo html::submitButton('<i class="icon icon-import icon-sm"></i> ' . $lang->import, '', 'btn btn-secondary');?>
+        <?php echo html::submitButton('<i class="icon icon-import icon-sm"></i> ' . $lang->import, '', 'btn');?>
       </div>
       <div class='btn-toolbar'>
         <?php echo html::backButton('', '', 'btn');?>