Author: Lars Michelsen <[email protected]>
Date: Tue Dec 4 20:12:24 2012 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Dec 4 20:12:24 2012 +0100
Bugfix: Added missing lock/unlock line middle control to BW-lines
---
ChangeLog | 1 +
share/frontend/nagvis-js/js/NagVisObject.js | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 25af52a..f35519e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Core:
Frontend:
* Hiding HTTP status error messages automatically on next successful request
+ * Bugfix: Added missing lock/unlock line middle control to BW-lines
* Bugfix: Fixed "img" not defined js error in IE8 (Please note: Zoom
function does not work in IE8 - IE8 event handling seems to be broken)
* Bugfix: Fixed flickering hover menu on overview page when sidebar opened
diff --git a/share/frontend/nagvis-js/js/NagVisObject.js
b/share/frontend/nagvis-js/js/NagVisObject.js
index bc9f017..fa4dccf 100644
--- a/share/frontend/nagvis-js/js/NagVisObject.js
+++ b/share/frontend/nagvis-js/js/NagVisObject.js
@@ -280,7 +280,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))
+ 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
@@ -949,7 +950,8 @@ var NagVisObject = Base.extend({
var x = this.conf.x.split(',');
var y = this.conf.y.split(',')
- if(this.conf.line_type != 10 && this.conf.line_type != 13 &&
this.conf.line_type != 14) {
+ if(this.conf.line_type != 10 && this.conf.line_type != 13
+ && this.conf.line_type != 14 && this.conf.line_type != 15) {
alert('Not available for this line. Only lines with 2 line parts
have a middle coordinate.');
return;
}
@@ -1056,7 +1058,8 @@ var NagVisObject = Base.extend({
makeDragable([this.conf.object_id+'-drag-'+i], this.saveObject,
this.moveObject);
}
- if(this.conf.view_type === 'line' && (this.conf.line_type == 10 ||
this.conf.line_type == 13 || this.conf.line_type == 14))
+ if(this.conf.view_type === 'line' && (this.conf.line_type == 10
+ || this.conf.line_type == 13 || this.conf.line_type == 14 ||
this.conf.line_type == 15))
this.parseControlToggleLineMid(x.length+2,
this.getLineMid(this.conf.x, 'x'), this.getLineMid(this.conf.y, 'y'), 20 - size
/ 2, -size / 2 + 5, size);
lineEndSize = null;
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
