From 9a83ebe44a7d3bb3bec27ee52a239ac8b9b832f3 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 26 Oct 2016 15:03:11 +0800
Subject: [PATCH]  * adjust for custom.

---
 module/custom/js/ajaxmenu.js | 5 +----
 module/custom/model.php      | 3 ++-
 module/doc/control.php       | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/module/custom/js/ajaxmenu.js b/module/custom/js/ajaxmenu.js
index d87a69e4df..4ae149465c 100644
--- a/module/custom/js/ajaxmenu.js
+++ b/module/custom/js/ajaxmenu.js
@@ -106,12 +106,9 @@ $(function()
     {
         return $.map(items, function(item)
         {
-            link = '';
-            if(item.link) link = item.text + '|' + item.link.module + '|' + item.link.method;
-            if(typeof(item.link.vars) != 'undefined') link = link + '|' + item.link.vars;
             var data = {name: item.name, order: parseInt(item.order)};
             if(item.hidden) data.hidden = true;
-            if(link) data.link = link;
+            if(item.buildLink) data.buildLink = item.buildLink;
             return data;
         });
     };
diff --git a/module/custom/model.php b/module/custom/model.php
index 9067ef5c69..2da9153e71 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -205,7 +205,7 @@ class customModel extends model
             $fixed  = '';
 
             $link = (is_array($item) and isset($item['link'])) ? $item['link'] : $item;
-            $link = (is_object($item) and isset($item->link)) ? $item->link : $link;
+            $link = (is_object($item) and isset($item->buildLink)) ? $item->buildLink : $link;
             /* The variable of item has not link and is not link then ignore it. */
             if(!is_string($link)) continue;
 
@@ -251,6 +251,7 @@ class customModel extends model
                 if($float)  $menuItem->float   = $float;
                 if($fixed)  $menuItem->fixed   = $fixed;
                 if($hidden) $menuItem->hidden  = $hidden;
+                if(is_object($item) and isset($item->buildLink)) $menuItem->buildLink = $item->buildLink;
                 if($isTutorialMode) $menuItem->tutorial = true;
 
                 while(isset($menu[$menuItem->order])) $menuItem->order++;
diff --git a/module/doc/control.php b/module/doc/control.php
index 8f839885ad..ad45009561 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -552,14 +552,14 @@ class doc extends control
 
         foreach($customMenus as $i => $customMenu)
         {
-            if(isset($customMenu->link) and strpos($customMenu->link, "|libID=$libID") !== false) unset($customMenus[$i]);
+            if(isset($customMenu->buildLink) and strpos($customMenu->buildLink, "|libID=$libID") !== false) unset($customMenus[$i]);
         }
 
         $lib = $this->doc->getLibByID($libID);
         $customMenu = new stdclass();
-        $customMenu->name = "custom{$libID}";
-        $customMenu->link = "$lib->name|doc|browse|libID=$libID";
-        $customMenu->order = count($customMenus); 
+        $customMenu->name      = "custom{$libID}";
+        $customMenu->buildLink = "$lib->name|doc|browse|libID=$libID";
+        $customMenu->order     = count($customMenus); 
         if($type == 'fixed') $customMenus[] = $customMenu;
         $this->setting->setItem("{$this->app->user->account}.common.customMenu.doc", json_encode($customMenus));
         die(js::reload('parent'));