From 90ad70d4401930651206d059da9cf6cb63b0c969 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 8 Aug 2018 13:51:54 +0800
Subject: [PATCH]  * finish task #4687.

---
 module/project/view/task.html.php | 24 ++++++++++++++----------
 module/task/model.php             |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 23a8413547..30b0b85f04 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -267,15 +267,17 @@ js::set('browseType', $browseType);
           <?php if($canBatchChangeModule):?>
           <div class="btn-group dropup">
             <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->moduleAB;?> <span class="caret"></span></button>
+            <?php $withSearch = count($modules) > 10;?>
+            <?php if($withSearch):?>
             <div class="dropdown-menu search-list" data-ride="searchList">
-              <?php $withSearch = count($modules) > 10;?>
-              <?php if($withSearch):?>
               <div class="input-control search-box has-icon-left has-icon-right search-example">
                 <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-              <?php endif;?>
+            <?php else:?>
+            <div class="dropdown-menu">
+            <?php endif;?>
               <div class="list-group">
                 <?php
                 foreach($modules as $moduleId => $module)
@@ -292,19 +294,21 @@ js::set('browseType', $browseType);
           <?php if($canBatchAssignTo):?>
           <div class="btn-group dropup">
             <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->assignedTo;?> <span class="caret"></span></button>
+            <?php
+            $withSearch = count($memberPairs) > 10;
+            $actionLink = $this->createLink('task', 'batchAssignTo', "projectID=$projectID");
+            echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
+            if($withSearch):
+            ?>
             <div class="dropdown-menu search-list" data-ride="searchList">
-              <?php
-              $withSearch = count($memberPairs) > 10;
-              $actionLink = $this->createLink('task', 'batchAssignTo', "projectID=$projectID");
-              echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
-              if($withSearch):
-              ?>
               <div class="input-control search-box has-icon-left has-icon-right search-example">
                 <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
                 <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
                 <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
               </div>
-              <?php endif;?>
+            <?php else:?>
+            <div class="dropdown-menu">
+            <?php endif;?>
               <div class="list-group">
                 <?php
                 foreach($memberPairs as $key => $value)
diff --git a/module/task/model.php b/module/task/model.php
index ed0c15226c..f1b196fe98 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -892,7 +892,7 @@ class taskModel extends model
             ->setDefault('assignedDate', $now)
             ->remove('comment,showModule')
             ->get();
-        if($oldTask->status != 'done' and $oldTask->status != 'closed' and $task->left == 0)
+        if($oldTask->status != 'done' and $oldTask->status != 'closed' and isset($task->left) and $task->left == 0)
         {
             dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->task->left);
             return false;