From cb5fea6b9f5e197ea3f9ab0fea7fe113957f3ee0 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sat, 23 Jun 2012 02:35:44 +0000
Subject: [PATCH]  * Code for task#802.

---
 module/bug/view/create.html.php         | 2 +-
 module/doc/view/create.html.php         | 2 +-
 module/group/view/create.html.php       | 2 +-
 module/product/view/create.html.php     | 2 +-
 module/productplan/view/create.html.php | 2 +-
 module/project/view/create.html.php     | 2 +-
 module/story/lang/en.php                | 1 +
 module/story/view/create.html.php       | 2 +-
 module/task/view/create.html.php        | 2 +-
 module/testcase/view/create.html.php    | 2 +-
 module/testtask/view/create.html.php    | 2 +-
 module/user/view/create.html.php        | 2 +-
 www/js/my.full.js                       | 5 ++---
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 8ee6d3f5aa..907e68b34e 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -16,7 +16,7 @@
 <?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>var holders = <?php echo json_encode($lang->bug->placeholder);?></script>
 <script language='Javascript'>
 userList = "<?php echo join(',', array_keys($users));?>".split(',');
 </script>
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index c7ac67ebf2..52759cee8b 100644
--- a/module/doc/view/create.html.php
+++ b/module/doc/view/create.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script>var holders = '<?php echo json_encode($lang->doc->placeholder);?>'</script>
+<script>var holders = <?php echo json_encode($lang->doc->placeholder);?></script>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
   <table class='table-1'> 
     <caption><?php echo $lang->doc->create;?></caption>
diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php
index 7f2dfd194b..7ef117936a 100644
--- a/module/group/view/create.html.php
+++ b/module/group/view/create.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<script>var holders='<?php echo json_encode($lang->group->placeholder);?>'</script>
+<script>var holders=<?php echo json_encode($lang->group->placeholder);?></script>
 <form method='post' target='hiddenwin'>
   <table align='center' class='table-4 a-left'> 
     <caption><?php echo $lang->group->create;?></caption>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index a735f9b18f..561eeb3601 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script>var holders='<?php echo json_encode($lang->product->placeholder);?>'</script>
+<script>var holders=<?php echo json_encode($lang->product->placeholder);?></script>
 <form method='post' target='hiddenwin'>
   <table class='table-1'> 
     <caption><?php echo $lang->product->create;?></caption>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index 0ed72d6fe2..b65034e384 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script>var holders='<?php echo json_encode($lang->productplan->placeholder);?>'</script>
+<script>var holders=<?php echo json_encode($lang->productplan->placeholder);?></script>
 <form method='post' target='hiddenwin'>
   <table class='table-1'> 
     <caption><?php echo $lang->productplan->create;?></caption>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 9d15584178..00ad3ec147 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -31,7 +31,7 @@ $(document).ready(function()
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script>var holders='<?php echo json_encode($lang->project->placeholder);?>'</script>
+<script>var holders=<?php echo json_encode($lang->project->placeholder);?></script>
 <form method='post' target='hiddenwin'>
   <table align='center' class='table-1 a-left'> 
     <caption><?php echo $lang->project->create;?></caption>
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index ad9f7b9b06..f289aa9d52 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -34,6 +34,7 @@ $lang->story->id             = 'ID';
 $lang->story->product        = 'Product';
 $lang->story->module         = 'Module';
 $lang->story->source         = 'Source';
+$lang->story->fromBug        = 'From bug';
 $lang->story->release        = 'Release';
 $lang->story->bug            = 'Related Bug';
 $lang->story->title          = 'Title';
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 0c43486e7e..e1067532e8 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include './header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script>var holders='<?php echo json_encode($lang->story->placeholder);?>'</script>
+<script>var holders=<?php echo json_encode($lang->story->placeholder);?></script>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
   <table align='center' class='table-1'> 
     <caption><?php echo $lang->story->create;?></caption>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index e881cc797f..dc42d16c2e 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -15,7 +15,7 @@
 <?php include '../../common/view/autocomplete.html.php';?>
 <?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 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'>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index dd2b7a50ce..76c78f3f90 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -13,7 +13,7 @@
 <?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>
+<script>var holders = <?php echo json_encode($lang->testcase->placeholder);?></script>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
   <table class='table-1'> 
     <caption><?php echo $lang->testcase->create;?></caption>
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index ddbb24ea0d..7b5466a5e4 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script>var holders = '<?php echo json_encode($lang->testtask->placeholder);?>'</script>
+<script>var holders = <?php echo json_encode($lang->testtask->placeholder);?></script>
 <form method='post' target='hiddenwin'>
   <table class='table-1'> 
     <caption><?php echo $lang->testtask->create;?></caption>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index 752c5a1460..ba24b7a0af 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<script>var holders = '<?php echo json_encode($lang->user->placeholder);?>'</script>
+<script>var holders = <?php echo json_encode($lang->user->placeholder);?></script>
 <form method='post' target='hiddenwin'>
   <table align='center' class='table-5'> 
     <caption><?php echo $lang->user->create;?></caption>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index b889728d21..e176a42edc 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -369,10 +369,9 @@ function setPlaceholder()
 {
     if(typeof(holders) != "undefined")
     {
-        holders = JSON.parse(holders);
-        for(key in holders)
+        for(var key in holders)
         {
-            $("#"+key).attr('placeholder',holders[key]);
+            $("#"+key).attr('placeholder', holders[key]);
         }
     }
 }