From 080ea27752a9bca1899d5490ea2d4782148b93ed Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 22 Jul 2014 09:10:00 +0000
Subject: [PATCH]  * code for task #1971,1961.

---
 module/story/js/batchcreate.js        |  4 ++--
 module/task/js/batchcreate.js         | 12 ++++++++++++
 module/task/js/edit.js                |  6 +++---
 module/task/view/activate.html.php    |  2 +-
 module/task/view/batchcreate.html.php | 10 +++++-----
 module/task/view/batchedit.html.php   | 14 +++++++-------
 module/task/view/create.html.php      |  6 +++---
 module/task/view/edit.html.php        | 12 ++++++------
 8 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/module/story/js/batchcreate.js b/module/story/js/batchcreate.js
index e4f7fcb8c0..7a7a4c871a 100644
--- a/module/story/js/batchcreate.js
+++ b/module/story/js/batchcreate.js
@@ -3,8 +3,8 @@ $(document).on('click', '.chosen-with-drop', function()
     var select = $(this).prev('select');
     if($(select).val() == 'same')
     {
-        var index = $(select).parent().index();
-        var value = $(select).parent().parent().prev('tr').find('td').eq(index).find('select').val();
+        var index = $(select).parents('td').index();
+        var value = $(select).parents('tr').prev('tr').find('td').eq(index).find('select').val();
         $(select).val(value);
         $(select).trigger("chosen:updated");
     }
diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
index 6b1fbe3333..8bd81f5d7b 100755
--- a/module/task/js/batchcreate.js
+++ b/module/task/js/batchcreate.js
@@ -40,3 +40,15 @@ function setStoryRelated(num)
         });
     }
 }
+
+$(document).on('click', '.chosen-with-drop', function()
+{
+    var select = $(this).prev('select');
+    if($(select).val() == 'ditto')
+    {
+        var index = $(select).parents('td').index();
+        var value = $(select).parents('tr').prev('tr').find('td').eq(index).find('select').val();
+        $(select).val(value);
+        $(select).trigger("chosen:updated");
+    }
+})
diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index ed3cb924c7..3127f054fe 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -18,7 +18,7 @@ function loadAll(projectID)
          firstChoice = confirm(confirmChangeProject);
          changeProjectConfirmed = true;    // Only notice the user one time.
     }
-    if(changeProjectConfirmed || firstChoice)
+    if(changeProjectConfirmed && firstChoice)
     {
         loadModuleMenu(projectID); 
         loadProjectStories(projectID);
@@ -36,7 +36,7 @@ function loadAll(projectID)
 function loadModuleMenu(projectID)
 {
     link = createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + projectID + '&viewtype=task');
-    $('#moduleIdBox').load(link);
+    $('#moduleIdBox').load(link, function(){$('#module').chosen(defaultChosenOptions);});
 }
 
 /**
@@ -49,7 +49,7 @@ function loadModuleMenu(projectID)
 function loadProjectStories(projectID)
 {
     link = createLink('story', 'ajaxGetProjectStories', 'projectID=' + projectID + '&productID=0&moduleID=0&storyID=' + oldStoryID);
-    $('#storyIdBox').load(link, function(){$('#story').chosen();});
+    $('#storyIdBox').load(link, function(){$('#story').chosen(defaultChosenOptions);});
 }
 
 /**
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index 8220bb0aff..249dcb37c9 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -24,7 +24,7 @@
   <table class='table table-form'>
     <tr>
       <th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
-      <td class='w-p45'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control'");?></td><td></td>
+      <td class='w-p45'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td><td></td>
     </tr>
     <tr>
       <th><?php echo $lang->task->left;?></th>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index a685b67dc3..7631b23c6b 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -20,12 +20,12 @@
   </div>
 </div>
 <form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table table-fixed table-form'>
+  <table class='table table-form'>
     <thead>
       <tr class='text-center'>
         <th class='w-30px'><?php echo $lang->idAB;?></th> 
         <th class='w-150px'><?php echo $lang->task->module?></th>
-        <th><?php echo $lang->task->story;?></th>
+        <th class='w-150px'><?php echo $lang->task->story;?></th>
         <th><?php echo $lang->task->name;?> <span class='required'></span></th>
         <th class='w-80px'><?php echo $lang->typeAB;?> <span class='required'></span></th>
         <th class='w-90px'><?php echo $lang->task->assignedTo;?></th>
@@ -58,10 +58,10 @@
     <?php $pri = 3;?>
     <tr>
       <td class='text-center'><?php echo $i+1;?></td>
-      <td><?php echo html::select("module[$i]", $modules, $module, 'class=form-control')?></td>
+      <td><?php echo html::select("module[$i]", $modules, $module, "class='form-control chosen'")?></td>
       <td style='overflow: visible'>
         <div class='input-group'>
-        <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control' onchange='setStoryRelated($i)'");?>
+        <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
         <span class='input-group-btn'>
         <a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-angle-right'></i></a>
         </span>
@@ -69,7 +69,7 @@
       </td>
       <td><?php echo html::input("name[$i]", '', 'class=form-control');?></td>
       <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
-      <td><?php echo html::select("assignedTo[$i]", $members, $member, 'class=form-control');?></td>
+      <td><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
       <td><?php echo html::input("estimate[$i]", '', 'class=form-control text-center');?></td>
       <td>
         <?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control'");?>
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 327890cffa..646604415b 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -19,7 +19,7 @@
 </div>
 
 <form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
-  <table class='table table-fixed table-form'>
+  <table class='table table-form'>
     <thead>
       <tr>
         <th class='w-30px'><?php echo $lang->idAB;?></th> 
@@ -27,8 +27,8 @@
         <th class='w-150px'><?php echo $lang->task->module?></th>
         <th class='w-100px'><?php echo $lang->task->assignedTo;?></th>
         <th class='w-80px'><?php echo $lang->typeAB;?> <span class='required'></span></th>
-        <th class='w-90px'><?php echo $lang->task->status;?></th>
-        <th class='w-60px'><?php echo $lang->task->pri;?></th>
+        <th class='w-100px'><?php echo $lang->task->status;?></th>
+        <th class='w-70px'><?php echo $lang->task->pri;?></th>
         <th class='w-40px'><?php echo $lang->task->estimateAB;?> <span class='required'></span></th>
         <th class='w-60px'><?php echo $lang->task->consumedThisTime?> <span class='required'></span></th>
         <th class='w-40px'><?php echo $lang->task->leftAB?> <span class='required'></span></th>
@@ -48,16 +48,16 @@
     <tr class='text-center'>
       <td><?php echo $taskID . html::hidden("taskIDList[$taskID]", $taskID);?></td>
       <td><?php echo html::input("names[$taskID]",          $tasks[$taskID]->name, 'class=form-control');?></td>
-      <td><?php echo html::select("modules[$taskID]",       $modules, $tasks[$taskID]->module, 'class=form-control')?></td>
-      <td><?php echo html::select("assignedTos[$taskID]",   $members, $tasks[$taskID]->assignedTo, 'class=form-control');?></td>
+      <td class='text-left'><?php echo html::select("modules[$taskID]",       $modules, $tasks[$taskID]->module, "class='form-control chosen'")?></td>
+      <td class='text-left'><?php echo html::select("assignedTos[$taskID]",   $members, $tasks[$taskID]->assignedTo, "class='form-control chosen'");?></td>
       <td><?php echo html::select("types[$taskID]",         $lang->task->typeList, $tasks[$taskID]->type, 'class=form-control');?></td>
       <td><?php echo html::select("statuses[$taskID]",      $lang->task->statusList, $tasks[$taskID]->status, 'class=form-control');?></td>
       <td><?php echo html::select("pris[$taskID]",          (array)$lang->task->priList, $tasks[$taskID]->pri, 'class=form-control');?></td>
       <td><?php echo html::input("estimates[$taskID]",      $tasks[$taskID]->estimate, "class='form-control text-center'");?></td>
       <td><?php echo html::input("consumeds[$taskID]",      '', "class='form-control text-center'");?></td>
       <td><?php echo html::input("lefts[$taskID]",          $tasks[$taskID]->left, "class='form-control text-center'");?></td>
-      <td><?php echo html::select("finishedBys[$taskID]",   $members, $tasks[$taskID]->finishedBy, 'class=form-control');?></td>
-      <td><?php echo html::select("closedBys[$taskID]",     $members, $tasks[$taskID]->closedBy, 'class=form-control');?></td>
+      <td class='text-left'><?php echo html::select("finishedBys[$taskID]",   $members, $tasks[$taskID]->finishedBy, "class='form-control chosen'");?></td>
+      <td class='text-left'><?php echo html::select("closedBys[$taskID]",     $members, $tasks[$taskID]->closedBy, "class='form-control chosen'");?></td>
       <td><?php echo html::select("closedReasons[$taskID]", $lang->task->reasonList, $tasks[$taskID]->closedReason, 'class=form-control');?></td>
     </tr>  
     <?php endforeach;?>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 3733a8fbbb..a910b2804b 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -30,7 +30,7 @@
       </tr>  
       <tr>
         <th><?php echo $lang->task->module;?></th>
-        <td id='moduleIdBox' class='w-p25-f'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control' onchange='setStories(this.value,$project->id)'");?></td><td></td><td class='w-150px'></td>
+        <td id='moduleIdBox' class='w-p25-f'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control chosen' onchange='setStories(this.value,$project->id)'");?></td><td></td><td class='w-150px'></td>
       </tr>
       <tr>
         <th><?php echo $lang->task->assignedTo;?></th>
@@ -44,7 +44,7 @@
         <th><?php echo $lang->task->story;?></th>
         <td colspan='2'>
           <div class='input-group'>
-            <?php echo html::select('story', $stories, $task->story, "class=form-control onchange='setStoryRelated();'");?>
+            <?php echo html::select('story', $stories, $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
             <span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>
           </div>
         </td>
@@ -86,7 +86,7 @@
       <tr>
         <th><?php echo $lang->task->mailto;?></th>
         <td colspan='2'><?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?></td>
-        <td class='text-top'><?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\"");?></td>
+        <td class='text-top'><?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");?></td>
       </tr>
       <tr>
         <th><?php echo $lang->files;?></th>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index c675d5351d..fbb2886e5f 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -61,15 +61,15 @@
         <table class='table table-form'> 
           <tr>
             <th class='w-70px'><?php echo $lang->task->project;?></th>
-            <td><?php echo html::select('project', $projects, $task->project, 'class="form-control" onchange="loadAll(this.value)"');?></td>
+            <td><?php echo html::select('project', $projects, $task->project, 'class="form-control chosen" onchange="loadAll(this.value)"');?></td>
           </tr>  
           <tr>
             <th><?php echo $lang->task->module;?></th>
-            <td id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control" onchange="loadModuleRelated()"');?></td>
+            <td id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control chosen" onchange="loadModuleRelated()"');?></td>
           </tr>  
           <tr>
             <th><?php echo $lang->task->story;?></th>
-            <td><span id="storyIdBox"><?php echo html::select('story', $stories, $task->story, 'class=form-control');?></span></td>
+            <td><span id="storyIdBox"><?php echo html::select('story', $stories, $task->story, "class='form-control chosen'");?></span></td>
           </tr>  
           <tr>
             <th><?php echo $lang->task->assignedTo;?></th>
@@ -131,7 +131,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->task->finishedBy;?></th>
-            <td><?php echo html::select('finishedBy', $members, $task->finishedBy, 'class=form-control');?></td>
+            <td><?php echo html::select('finishedBy', $members, $task->finishedBy, "class='form-control chosen'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->task->finishedDate;?></th>
@@ -139,7 +139,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->task->canceledBy;?></th>
-            <td><?php echo html::select('canceledBy', $users, $task->canceledBy, 'class="form-control"');?></td>
+            <td><?php echo html::select('canceledBy', $users, $task->canceledBy, 'class="form-control chosen"');?></td>
           </tr>
           <tr>
             <th><?php echo $lang->task->canceledDate;?></th>
@@ -147,7 +147,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->task->closedBy;?></th>
-            <td><?php echo html::select('closedBy', $users, $task->closedBy, 'class="form-control"');?></td>
+            <td><?php echo html::select('closedBy', $users, $task->closedBy, 'class="form-control chosen"');?></td>
           </tr>
           <tr>
             <th><?php echo $lang->task->closedReason;?></th>