[Nagvis-checkins] SF.net Git: nagvis: Removed not applying context menu entry from lines with only one part

[lars]

Module: nagvis
Branch: master
Commit: e8bc825d1c269417011eac989b66179024cbc74c
URL:    
http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=e8bc825d1c269417011eac989b66179024cbc74c

Author: Lars Michelsen <l...@larsmichelsen.com>
Date:   Thu Jan 20 17:30:33 2011 +0100

Removed not applying context menu entry from lines with only one part

---

 TODO                                           |    4 +++-
 share/frontend/nagvis-js/js/NagVisObject.js    |    2 ++
 share/frontend/nagvis-js/js/nagvis.js          |    2 +-
 share/server/core/classes/CoreModGeneral.php   |    4 +++-
 share/userfiles/templates/default.context.html |    2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index d189923..1584995 100644
--- a/TODO
+++ b/TODO
@@ -6,10 +6,12 @@ Relative Koordinaten:
        - Wenn ein Objekt nicht mehr existiert, dann ist 0/0 die Referenz
        - Beim Löschen von Objekten prüfen, ob andere Objekte auf dieses 
Objekt verweisen
        - Wie funktionieren Linien zu Linien Referenzen? Geht das überhaupt?
-  - Es gibt noch Probleme, wenn die object_id nur aus Zahlen besteht. Abfangen!
        - Dokumentation
        - WUI: Von absoluten zu relativen Koordinaten umschalten
 
+Dragging:
+  - Hover und Context Menu deaktivieren
+
 HTML/JS Frontend:
   - aMapObjects in Objekt umbauen - mit object_id als Schlüssel
 
diff --git a/share/frontend/nagvis-js/js/NagVisObject.js 
b/share/frontend/nagvis-js/js/NagVisObject.js
index 782f306..97f28ba 100644
--- a/share/frontend/nagvis-js/js/NagVisObject.js
+++ b/share/frontend/nagvis-js/js/NagVisObject.js
@@ -199,6 +199,8 @@ var NagVisObject = Base.extend({
 
                if(this.conf.view_type !== 'line')
                        oSectionMacros.line = 
'<!--\\sBEGIN\\sline\\s-->.+?<!--\\sEND\\sline\\s-->';
+               if(this.conf.view_type !== 'line' || (this.conf.line_type == 11 
|| this.conf.line_type == 12))
+                       oSectionMacros.line_type = 
'<!--\\sBEGIN\\sline_two_parts\\s-->.+?<!--\\sEND\\sline_two_parts\\s-->';
 
                // Replace hostgroup range macros when not in a hostgroup
                if(this.conf.type !== 'hostgroup')
diff --git a/share/frontend/nagvis-js/js/nagvis.js 
b/share/frontend/nagvis-js/js/nagvis.js
index fca1f95..a043bfe 100644
--- a/share/frontend/nagvis-js/js/nagvis.js
+++ b/share/frontend/nagvis-js/js/nagvis.js
@@ -1218,5 +1218,5 @@ function pxToInt(v) {
 }
 
 function isRelativeCoord(v) {
-  return !isInt(v);
+  return !isInt(v) || v.length === 6;
 }
diff --git a/share/server/core/classes/CoreModGeneral.php 
b/share/server/core/classes/CoreModGeneral.php
index 893e66a..087d0d0 100644
--- a/share/server/core/classes/CoreModGeneral.php
+++ b/share/server/core/classes/CoreModGeneral.php
@@ -109,7 +109,9 @@ class CoreModGeneral extends CoreModule {
                                $OBJ = new NagVisHoverMenu($this->CORE, $sName);
                        else
                                $OBJ = new NagVisContextMenu($this->CORE, 
$sName);
-                       $arrReturn[] = Array('name' => $sName, 'code' => 
str_replace("\r\n", "", str_replace("\n", "", $OBJ->__toString())));
+
+                       $arrReturn[] = Array('name' => $sName,
+                                            'code' => str_replace("\r\n", "", 
str_replace("\n", "", $OBJ->__toString())));
                }
                
                return json_encode($arrReturn);
diff --git a/share/userfiles/templates/default.context.html 
b/share/userfiles/templates/default.context.html
index 5ee7370..6ddfa2b 100644
--- a/share/userfiles/templates/default.context.html
+++ b/share/userfiles/templates/default.context.html
@@ -2,7 +2,9 @@
        <li><a href="#" onClick="refreshMapObject('[obj_id]'); 
contextHide();">[lang_refresh_status]</a></li>
        <li><a href="#" onClick="toggleMapObjectLock('[obj_id]'); 
contextHide();">[lang_toggle_lock]</a></li>
        <!-- BEGIN line -->
+       <!-- BEGIN line_two_parts -->
        <li><a href="#" onClick="toggleLineMidLock('[obj_id]'); 
contextHide();">[lang_toggle_line_mid]</a></li>
+       <!-- END line_two_parts -->
        <!-- END line -->
        <!-- BEGIN host -->
        <li class="spacer"></li>



------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Nagvis-checkins mailing list
Nagvis-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins