[Nagvis-checkins] SF.net Git: nagvis: Ported child changes patch from 1.5x to 1.6 ( Thanks to hipska)

[lars]

Author:   Lars Michelsen <l...@larsmichelsen.com>
Date:     Wed Apr 27 18:52:47 2011 +0200
Committer:   Lars Michelsen <l...@larsmichelsen.com>
Commit-Date: Wed Apr 27 18:52:47 2011 +0200

Ported child changes patch from 1.5x to 1.6 (Thanks to hipska)

---

 share/frontend/nagvis-js/js/hover.js               |   20 +++++++++++---------
 .../core/classes/objects/NagVisStatefulObject.php  |    4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/share/frontend/nagvis-js/js/hover.js 
b/share/frontend/nagvis-js/js/hover.js
index ed11589..8c757bf 100644
--- a/share/frontend/nagvis-js/js/hover.js
+++ b/share/frontend/nagvis-js/js/hover.js
@@ -34,6 +34,7 @@
 function replaceHoverTemplateChildMacros(oObj, sTemplateCode) {
     var mapName = '';
     var childsHtmlCode = '';
+    var regex = '';
 
     if(typeof(oPageProperties) != 'undefined' && oPageProperties != null)
         mapName = oPageProperties.map_name;
@@ -68,12 +69,15 @@ function replaceHoverTemplateChildMacros(oObj, 
sTemplateCode) {
                 childsHtmlCode += replaceHoverTemplateMacrosChild(oMember, 
rowHtmlCode);
             }
         }
-
-        var regex = getRegEx('loopChild', 
"<!--\\sBEGIN\\sloop_child\\s-->(.+?)<!--\\sEND\\sloop_child\\s-->");
-        sTemplateCode = sTemplateCode.replace(regex, childsHtmlCode);
-        regex = null;
     }
 
+    if(childsHtmlCode != '')
+        regex = getRegEx('loopChild', 
"<!--\\sBEGIN\\sloop_child\\s-->(.+?)<!--\\sEND\\sloop_child\\s-->");
+    else
+        regex = getRegEx('loopChildEmpty', 
'<!--\\sBEGIN\\schilds\\s-->.+?<!--\\sEND\\schilds\\s-->');
+
+    sTemplateCode = sTemplateCode.replace(regex, childsHtmlCode);
+    regex = null;
     childsHtmlCode = null;
     rowHtmlCode = null;
 
@@ -173,8 +177,7 @@ function replaceHoverTemplateDynamicMacros(oObj) {
     }
 
     // Replace child macros
-    if(oObj.conf.hover_childs_show && oObj.conf.hover_childs_show == '1'
-         && typeof oObj.conf.num_members != 'undefined' && 
oObj.conf.num_members > 0)
+    if(oObj.conf.hover_childs_show && oObj.conf.hover_childs_show == '1')
         sTemplateCode = replaceHoverTemplateChildMacros(oObj, sTemplateCode);
 
     // Replace all normal macros
@@ -270,8 +273,7 @@ function replaceHoverTemplateStaticMacros(oObj, 
sTemplateCode) {
         oSectionMacros.map = 
'<!--\\sBEGIN\\smap\\s-->.+?<!--\\sEND\\smap\\s-->';
 
     // Replace child section when unwanted
-    if((oObj.conf.hover_childs_show && oObj.conf.hover_childs_show != '1')
-        || !isset(oObj.conf.num_members) || oObj.conf.num_members == 0)
+    if(oObj.conf.hover_childs_show && oObj.conf.hover_childs_show != '1')
         oSectionMacros.childs = 
'<!--\\sBEGIN\\schilds\\s-->.+?<!--\\sEND\\schilds\\s-->';
 
     // Loop and replace all unwanted section macros
@@ -333,4 +335,4 @@ function displayHoverMenu(event, objId, iHoverDelay) {
         else
             hoverShow(event.clientX, event.clientY, objId);
     }
-}
\ No newline at end of file
+}
diff --git a/share/server/core/classes/objects/NagVisStatefulObject.php 
b/share/server/core/classes/objects/NagVisStatefulObject.php
index f429f86..ebd490c 100644
--- a/share/server/core/classes/objects/NagVisStatefulObject.php
+++ b/share/server/core/classes/objects/NagVisStatefulObject.php
@@ -548,7 +548,7 @@ class NagVisStatefulObject extends NagVisObject {
 
         // Enable/Disable fetching children
         $arr['members'] = Array();
-        if($bFetchChilds && $this->hasMembers())
+        if($bFetchChilds && method_exists($this, 'getMembers'))
             foreach($this->getSortedObjectMembers() AS $OBJ)
                 $arr['members'][] = $OBJ->fetchObjectAsChild();
 
@@ -947,4 +947,4 @@ class NagVisStatefulObject extends NagVisObject {
         }*/
     }
 }
-?>
\ No newline at end of file
+?>


------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network 
management toolset available today.  Delivers lowest initial 
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Nagvis-checkins mailing list
Nagvis-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins