From 2dabae4f6cfbb155e2f747644806248cb5728a31 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Sat, 27 Apr 2013 05:08:48 +0000
Subject: [PATCH]  * finish task#1229.

---
 module/my/view/task.html.php      |  2 +-
 module/project/js/task.js         |  6 ++++++
 module/project/view/task.html.php | 20 +++++++++++++++++---
 module/task/control.php           |  6 +++---
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index ac307e9dd5..647e782edd 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -49,7 +49,7 @@
     <?php foreach($tasks as $task):?>
     <tr class='a-center'>
       <td>
-        <?php if($canBatchClose):?><input type='checkbox' name='tasks[]' value='<?php echo $task->id;?>' /><?php endif;?>
+        <?php if($canBatchClose):?><input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>' /><?php endif;?>
         <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>
       </td>
       <td><span class='<?php echo 'pri' . $lang->task->priList[$task->pri];?>'><?php echo isset($lang->task->priList[$task->pri]) ? $lang->task->priList[$task->pri] : $task->pri;?></span></td>
diff --git a/module/project/js/task.js b/module/project/js/task.js
index 685d4577ce..f864a0e90e 100644
--- a/module/project/js/task.js
+++ b/module/project/js/task.js
@@ -4,6 +4,12 @@ $(function()
     if(browseType == 'bysearch') ajaxGetSearchForm();
 });
 
+function changeAction(formName, actionName, actionLink)
+{
+    if(actionName == 'batchClose') $('#' + formName).attr('target', 'hiddenwin');
+    $('#' + formName).attr('action', actionLink).submit();
+}
+
 function showProject()
 {
     $('#sidebar').hide();
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 7679fbe1cf..d5dae37426 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -46,7 +46,7 @@ var browseType  = '<?php echo $browseType;?>';
     <td class='divider'></td>
     <?php endif?>
     <td>
-      <form method='post' action='<?php echo $this->createLink('task', 'batchEdit', "projectID=$project->id&from=projectTask&orderBy=$orderBy");?>'>
+      <form method='post' id='projectTaskForm'>
         <table class='table-1 fixed colored tablesorter datatable'>
           <?php $vars = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
           <thead>
@@ -148,8 +148,22 @@ var browseType  = '<?php echo $browseType;?>';
               <td colspan='<?php echo $columns;?>'>
                 <div class='f-left'>
                 <?php 
-                  if(common::hasPriv('task', 'batchEdit') and count($tasks))echo html::selectAll() . html::selectReverse() . html::submitButton($lang->edit); 
-                  echo $summary;
+                if(count($tasks))
+                {
+                    echo html::selectAll() . html::selectReverse();
+
+                    if(common::hasPriv('task', 'batchEdit'))
+                    {
+                        $actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID&from=projectTask&orderBy=$orderBy");
+                        echo html::commonButton($lang->edit, "onclick=\"changeAction('projectTaskForm', 'batchEdit', '$actionLink')\"");
+                    }
+                    if(common::hasPriv('task', 'batchClose') and strtolower($browseType) != 'closedBy')
+                    {
+                        $actionLink = $this->createLink('task', 'batchClose');
+                        echo html::commonButton($lang->close, "onclick=\"changeAction('projectTaskForm', 'batchClose', '$actionLink')\"");
+                    }
+                }
+                echo $summary;
                 ?>
                 </div>
                 <?php $pager->show();?>
diff --git a/module/task/control.php b/module/task/control.php
index 45c2ea97ae..6931f75634 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -614,10 +614,10 @@ class task extends control
      */
     public function batchClose()
     {
-        if($this->post->tasks)
+        if($this->post->taskIDList)
         {
-            $tasks = $this->post->tasks;
-            unset($_POST['tasks']);
+            $tasks = $this->post->taskIDList;
+            unset($_POST['taskIDList']);
             $this->loadModel('action');
 
             foreach($tasks as $taskID)