From 18065ba29b82d82394958587e9f279cfbbb00e83 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 26 Apr 2011 08:32:01 +0000
Subject: [PATCH]  * fix for bug

---
 module/tree/control.php          | 12 +++++++++++-
 module/tree/js/browse.js         | 27 +++------------------------
 module/tree/view/browse.html.php | 10 +++++-----
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/module/tree/control.php b/module/tree/control.php
index 2f535e5cc8..64709381f7 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -53,7 +53,17 @@ class tree extends control
         if($viewType == 'story')
         {
             $this->product->setMenu($this->product->getPairs(), $rootID, 'story');
-            $this->view->allProduct = $this->product->getPairs();
+            $products = $this->product->getPairs();
+            $allProduct = array();
+            foreach($products as $key => $productVal)
+            {
+                if($key == $rootID) continue;
+                $allProduct[$key] = $productVal;
+            }
+            $this->view->allProduct =$allProduct;
+            $keys = array_keys($allProduct);
+            $this->view->key = $keys[0];
+            $this->view->productModules = $this->tree->getOptionMenu($keys[0], 'story');
             $this->lang->tree->menu = $this->lang->product->menu;
             $this->lang->set('menugroup.tree', 'product');
 
diff --git a/module/tree/js/browse.js b/module/tree/js/browse.js
index 2e78bd4bb1..7b821d7b75 100644
--- a/module/tree/js/browse.js
+++ b/module/tree/js/browse.js
@@ -14,33 +14,12 @@ function syncModule(rootID)
             })
         });  
         $.each(modules, function(key, value)
-        {   
-            if(value) $('#sonModule').append("<span><input name=modules[] value=" + value + " style=margin-bottom:5px class=text-3 /><br /><span>");
-        })
-    })
-}
-function syncProductModule(rootID)
-{
-    link = createLink('tree', 'ajaxGetSonModules', 'moduleID=' + $('#productModule').val() + '&rootID=' + rootID);
-    $.getJSON(link, function(modules)
-    {
-        $('.helplink').addClass('hidden');
-        $.each(modules, function(key, value)
-        {   
-            moduleName = value;
-            $('.text-3').each(function()
-            {
-                if(this.value == moduleName) modules[key] = null;
-                if(!this.value) $(this).parent().addClass('hidden');
-            })
-        });
-        $('#sonModule').empty();
-        $.each(modules, function(key, value)
-        {
+        {  
             if(value) $('#sonModule').append("<span><input name=modules[] value=" + value + " style=margin-bottom:5px class=text-3 /><br /><span>");
         })
     })
 }
+
 function syncProduct(obj)
 {
     link = createLink('tree', 'ajaxGetModules', 'rootID=' + obj.value);
@@ -53,7 +32,7 @@ function syncProduct(obj)
             $('#productModule').append('<option value=' + key + '>' + value + '</option')
         }); 
     })
-    $('#copyModule').attr('onclick', 'syncProductModule('+obj.value+')');
+    $('#copyModule').attr('onclick', 'syncModule('+obj.value+')');
 }
 $(document).ready(function()
 {
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index b2e7007ac4..5b1d54c1ae 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -59,22 +59,22 @@
               }
               else if($viewType == 'story')
               {
-                  echo html::select('allProduct', $allProduct, $rootID, 'class=select-3 onchange=syncProduct(this)');
-                  echo html::select('productModule', $productModules, '', 'class=select-3');
-                  echo html::commonButton($lang->tree->syncFromProduct, 'id=copyModule onclick=syncProductModule('.$rootID.')');
+                  echo html::select('allProduct', $allProduct, 'onchange=syncProduct(this)');
+                  echo html::select('productModule', $productModules, '');
+                  echo html::commonButton($lang->tree->syncFromProduct, 'id=copyModule onclick=syncModule('.$key.')');
                   echo '<br />';
                   echo '<br />';
                   echo '<br />';
               }
               $maxOrder = 0;
-              echo '<div id=sonModule>';
+              echo '<div id="sonModule">';
               foreach($sons as $sonModule)
               {
                   if($sonModule->order > $maxOrder) $maxOrder = $sonModule->order;
                   echo '<span>' . html::input("modules[id$sonModule->id]", $sonModule->name, 'class=text-3 style="margin-bottom:5px"') . '<br /></span>';
               }
               for($i = 0; $i < TREE::NEW_CHILD_COUNT ; $i ++) echo '<span>' . html::input("modules[]", '', 'class=text-3 style="margin-bottom:5px"') . '<br /></span>';
-            ?>
+              ?>
               </div>
             </td>
           </tr>