From 4b2cf497a356822d0c7192d06f7a394a48350bb7 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Tue, 19 Jun 2012 06:43:01 +0000
Subject: [PATCH]  * Code for task#848.

---
 lib/front/front.class.php                 | 2 +-
 module/bug/js/create.js                   | 1 +
 module/bug/js/edit.js                     | 2 +-
 module/bug/view/create.html.php           | 2 ++
 module/bug/view/edit.html.php             | 5 +++--
 module/common/lang/en.php                 | 2 ++
 module/common/lang/zh-cn.php              | 2 ++
 module/task/js/batchcreate.js             | 3 +++
 module/task/js/create.js                  | 2 +-
 module/task/js/edit.js                    | 3 +--
 module/task/view/batchcreate.html.php     | 7 ++++++-
 module/task/view/create.html.php          | 1 +
 module/task/view/edit.html.php            | 6 +++---
 module/testcase/js/batchcreate.js         | 4 ++++
 module/testcase/js/create.js              | 1 +
 module/testcase/js/edit.js                | 1 +
 module/testcase/view/batchcreate.html.php | 7 ++++++-
 module/testcase/view/create.html.php      | 2 ++
 module/testcase/view/edit.html.php        | 5 +++--
 19 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100755 module/task/js/batchcreate.js
 create mode 100755 module/testcase/js/batchcreate.js

diff --git a/lib/front/front.class.php b/lib/front/front.class.php
index c5d80bc0ab..ea460cadd0 100644
--- a/lib/front/front.class.php
+++ b/lib/front/front.class.php
@@ -115,7 +115,7 @@ class html
 
         /* The begin. */
         $id = $name;
-        if($pos = strpos($name, '[')) $id = substr($name, 0, $pos);
+        if(strpos($name, '[') !== false) $id = trim(str_replace(']', '', str_replace('[', '', $name)));
         $string = "<select name='$name' id='$id' $attrib>\n";
 
         /* The options. */
diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index bd6ae0d44b..6e5dd9c503 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -148,6 +148,7 @@ function loadProjectBuilds(projectID)
 }
 
 $(function() {
+    $("#story").chosen({no_results_text:noResultsMatch});
     $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
     setAssignedTo();
 })
diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js
index e0b59ea066..18afb5cfaa 100644
--- a/module/bug/js/edit.js
+++ b/module/bug/js/edit.js
@@ -187,7 +187,7 @@ function getList(module)
 }
 
 $(function() {
+    $("#story").chosen({no_results_text: noResultsMatch});
     $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
-    $("#searchStories").colorbox({width:680, height:400, iframe:true, transition:'none'});
     $("#searchTasks").colorbox({width:680, height:400, iframe:true, transition:'none'});
 });
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index ccefc3d881..e8b625a8ef 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -11,9 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/chosen.html.php';?>
 <?php include '../../common/view/autocomplete.html.php';?>
 <?php include '../../common/view/alert.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<script>var noResultsMatch = '<?php echo $lang->noResultsMatch;?>'</script>
 <script>var holders = '<?php echo json_encode($lang->bug->placeholder);?>'</script>
 <script language='Javascript'>
 userList = "<?php echo join(',', array_keys($users));?>".split(',');
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 6cd6689826..3c55d23033 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -11,9 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/chosen.html.php';?>
 <?php include '../../common/view/autocomplete.html.php';?>
 <?php include '../../common/view/alert.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<script>var noResultsMatch = <?php echo $lang->noResultsMatch;?></script>
 <script language='Javascript'>
 changeProductConfirmed = false;
 changeProjectConfirmed = false;
@@ -129,8 +131,7 @@ userList               = "<?php echo join(',', array_keys($users));?>".split(','
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->bug->story;?></td>
-            <td><div id='storyIdBox' class='searchleft'><?php echo html::select('story', $stories, $bug->story, "class=select-3");?></div>
-            <!--<div id='storyListIdBox'><?php echo html::a('', $lang->go, "_blank", "class='search' id='searchStories' onclick=getList('story')");?></div>-->
+            <td><div id='storyIdBox'><?php echo html::select('story', $stories, $bug->story, "class=select-3");?></div>
             </td>
           </tr>
           <tr>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 73c2f1d3a2..973539501b 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -297,6 +297,8 @@ $lang->zentaoDESC     = "ZenTaoPMS is an open sourced project management system.
 
 $lang->suhosinInfo = "Warming:data is too large! Please enlarge the setting of <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> in php.ini. Otherwise partial data can't be saved.";
 
+$lang->noResultsMatch = "No results match";
+
 /* Date times. */
 define('DT_DATETIME1',  'Y-m-d H:i:s');
 define('DT_DATETIME2',  'y-m-d H:i');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index d245d02e41..2dce6b8137 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -297,6 +297,8 @@ $lang->zentaoDESC     = "禅道项目管理软件(ZenTaoPMS)是一款国产的
 
 $lang->suhosinInfo = "警告：数据太多，请在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（设置更大的数）。 保存并重新启动apache，否则会造成部分数据无法保存。";
 
+$lang->noResultsMatch = "没有匹配结果";
+
 /* 时间格式设置。*/
 define('DT_DATETIME1',  'Y-m-d H:i:s');
 define('DT_DATETIME2',  'y-m-d H:i');
diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
new file mode 100755
index 0000000000..624f9d112d
--- /dev/null
+++ b/module/task/js/batchcreate.js
@@ -0,0 +1,3 @@
+$(function() {
+    for(i=0; i<batchCreateNum; i++) $("#story" + i).chosen({no_results_text: noResultsMatch});
+})
diff --git a/module/task/js/create.js b/module/task/js/create.js
index d29c6be100..3e788a760f 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -40,6 +40,6 @@ function setPreview()
 $(document).ready(function()
 {
     setPreview();
-    $("#story").chosen();
+    $("#story").chosen({no_results_text: noResultsMatch});
     $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
 });
diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index 36f6738d52..80e7240cf6 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -1,5 +1,4 @@
 $(function() {
+    $("#story").chosen({no_results_text: noResultsMatch});
     $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
-    $("#searchStories").colorbox({width:680, height:400, iframe:true, transition:'none'});
-
 })
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index c3ee154275..abaf1af7f6 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -11,6 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/chosen.html.php';?>
+<script>
+  var batchCreateNum = '<?php echo $config->task->batchCreate;?>'; 
+  var noResultsMatch = '<?php echo $lang->noResultsMatch;?>';
+</script>
 <form method='post'>
   <table class='table-1 fixed'> 
     <caption><?php echo $lang->task->project . $lang->colon . $lang->task->batchCreate;?></caption>
@@ -31,7 +36,7 @@
     <?php $pri = 3;?>
     <tr class='a-center'>
       <td><?php echo $i+1;?></td>
-      <td><?php echo html::select("story[$i]", $stories, $story, 'class=select-1');?></td>
+      <td class='a-left' style='overflow:visible'><?php echo html::select("story[$i]", $stories, $story, "class='select-1'");?></td>
       <td><?php echo html::input("name[$i]", '', 'class=text-1'); echo "<span class='star'>*</span>";?></td>
       <td><?php echo html::textarea("desc[$i]", '', "class=text-1 rows='1'");?></td>
       <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=select-1'); echo "<span class='star'>*</span>";?></td>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index c35eb2bc37..2679417808 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -16,6 +16,7 @@
 <?php include '../../common/view/chosen.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <script> var holders = '<?php echo json_encode($lang->task->placeholder);?>'</script>
+<script> var noResultsMatch = '<?php echo $lang->noResultsMatch;?>'</script>
 <script language='javascript'> var userList = "<?php echo join(',', array_keys($users));?>".split(',');</script>
 <script language='Javascript'>
 $(function()
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index e43f6ad907..92305f1678 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -12,8 +12,10 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php include '../../common/view/chosen.html.php';?>
 <?php include '../../common/view/autocomplete.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<script> var noResultsMatch = '<?php echo $lang->noResultsMatch;?>'</script>
 <script language='Javascript'>var userList = "<?php echo join(',', array_keys($users));?>".split(',');</script>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
 <div id='titlebar'>
@@ -54,9 +56,7 @@
           </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->story;?></th>
-            <td><div class='searchleft'><?php echo html::select('story', $stories, $task->story, 'class=select-1');?></div>
-            <?php echo html::a($this->createLink('search', 'select', "productID=0&projectID=$project->id&module=story&storyID=$task->story"), $lang->go, "_blank", "class='search' id='searchStories'");?>
-            </td>
+            <td><?php echo html::select('story', $stories, $task->story, 'class=select-1');?></td>
           </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
diff --git a/module/testcase/js/batchcreate.js b/module/testcase/js/batchcreate.js
new file mode 100755
index 0000000000..082e595fde
--- /dev/null
+++ b/module/testcase/js/batchcreate.js
@@ -0,0 +1,4 @@
+$(document).ready(function()
+{
+    for(i = 0; i < testcaseBatchCreateNum; i++) $("#story" + i).chosen({no_results_text: noResultsMatch});
+});
diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js
index c1e6edae3e..7a628a1f0a 100644
--- a/module/testcase/js/create.js
+++ b/module/testcase/js/create.js
@@ -14,5 +14,6 @@ function setPreview()
 }
 $(function()
 {
+     $("#story").chosen({no_results_text: noResultsMatch});
      $("#preview").colorbox({width:1000, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
 })
diff --git a/module/testcase/js/edit.js b/module/testcase/js/edit.js
index ceee55726a..5e1c0dd109 100644
--- a/module/testcase/js/edit.js
+++ b/module/testcase/js/edit.js
@@ -15,5 +15,6 @@ function getList()
 
 $(document).ready(function()
 {
+    $("#story").chosen({no_results_text: noResultsMatch});
     $("#searchStories").colorbox({width:680, height:400, iframe:true, transition:'none'});
 });
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index b524caefe2..14bccdc05c 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -11,6 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/chosen.html.php';?>
+<script>
+  var testcaseBatchCreateNum = '<?php echo $config->testcase->batchCreate;?>';
+  var noResultsMatch = '<?php echo $lang->noResultsMatch;?>';
+</script>
 <form method='post' enctype='multipart/form-data'>
   <table align='center' class='table-1 fixed'> 
     <caption><?php echo $lang->testcase->batchCreate;?></caption>
@@ -30,7 +35,7 @@
       <td><?php echo $i+1;?></td>
       <td><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class=select-1");?></td>
       <td><?php echo html::select("type[$i]", $lang->testcase->typeList, $type, "class=select-1"); echo "<span class='star'>*</span>";?></td>
-      <td><?php echo html::select("story[$i]", $stories, $story, 'class=select-1');?></td>
+      <td class='a-left'style='overflow:visible'><?php echo html::select("story[$i]", $stories, $story, 'class=select-1');?></td>
       <td><?php echo html::input("title[$i]", '', "class='text-1'"); echo "<span class='star'>*</span>";?></td>
     </tr>  
     <?php endfor;?>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index cc7ff68516..1298accfd9 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -11,6 +11,8 @@
  */
 ?>
 <?php include './header.html.php';?>
+<?php include '../../common/view/chosen.html.php';?>
+<script>var noResultsMatch = '<?php echo $lang->noResultsMatch;?>'</script>
 <script>var holders = '<?php echo json_encode($lang->testcase->placeholder);?>'</script>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
   <table class='table-1'> 
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 6438962c25..9cc057da00 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -11,6 +11,8 @@
  */
 ?>
 <?php include './header.html.php';?>
+<?php include '../../common/view/chosen.html.php';?>
+<script>var noResultsMatch = '<?php echo $lang->noResultsMatch;?>'</script>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
 <div id='titlebar'>
   <div id='main'>
@@ -84,8 +86,7 @@
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->testcase->story;?></td>
-            <td class='a-left'><div id='storyIdBox' class='searchleft'><?php echo html::select('story', $stories, $case->story, 'class=select-1');?></div>
-            <!--<div id='storyListIdBox'><?php echo html::a('', $lang->go, "_blank", "class='search' id='searchStories' onclick=getList()");?></div>-->
+            <td class='a-left'><div id='storyIdBox'><?php echo html::select('story', $stories, $case->story, 'class=select-1');?></div>
             </td>       
           </tr>
           <tr>