From ac2bfc94dd38f460159c1c81f615fe475757ffeb Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 11 Apr 2016 17:30:27 +0800
Subject: [PATCH]  * adjust for integrate ranzhi.

---
 module/block/control.php         | 21 ++++++++++++---------
 module/block/js/admin.js         |  2 +-
 module/block/view/admin.html.php |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index b13af03a30..c8a61334cd 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -260,17 +260,20 @@ class block extends control
         if($mode == 'getblocklist')
         {   
             $blocks = $this->block->getAvailableBlocks($module);
-            if($this->selfCall)
+            if(!$this->selfCall)
             {
-                $blocks     = json_decode($blocks, true);
-                $blockPairs = array('' => '') + $blocks;
-
-                $block = $this->block->getBlock($index);
-
-                echo "<th>{$this->lang->block->lblBlock}</th>";
-                echo '<td>' . html::select('moduleBlock', $blockPairs, ($block and $block->source != '') ? $block->block : '', "class='form-control' onchange='getBlockParams(this.value, \"$module\")'") . '</td>';
-                if(isset($block->source)) echo "<script>$(function(){getBlockParams($('#moduleBlock').val(), '{$block->source}')})</script>";
+                echo $blocks;
+                return true;
             }
+
+            $blocks     = json_decode($blocks, true);
+            $blockPairs = array('' => '') + $blocks;
+
+            $block = $this->block->getBlock($index);
+
+            echo "<th>{$this->lang->block->lblBlock}</th>";
+            echo '<td>' . html::select('moduleBlock', $blockPairs, ($block and $block->source != '') ? $block->block : '', "class='form-control' onchange='getBlockParams(this.value, \"$module\")'") . '</td>';
+            if(isset($block->source)) echo "<script>$(function(){getBlockParams($('#moduleBlock').val(), '{$block->source}')})</script>";
         }   
         elseif($mode == 'getblockform')
         {   
diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index 6bb2560f77..44fe224e70 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -66,7 +66,7 @@ function getBlockParams(type, moduleID)
 $(function()
 {
     $('#modules').change(function(){getBlocks($(this).val())});
-    getBlocks($('#modules').val());
+    if($('#modules').size() > 0) getBlocks($('#modules').val());
 
     $(document).on('click', '.dropdown-menu.buttons .btn', function()
     {
diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php
index 3dbafb563a..6346630fe1 100644
--- a/module/block/view/admin.html.php
+++ b/module/block/view/admin.html.php
@@ -25,6 +25,6 @@
   <?php endif;?>
   <tr><?php if(!empty($blocks)) echo $blocks;?></tr>
 </table>
-<div id='blockParam'><?php if(!empty($blocks)) echo $blocks;?></div>
+<div id='blockParam'></div>
 <?php js::set('index', $index)?>
 <?php include '../../common/view/footer.lite.html.php';?>