Author: Lars Michelsen <[email protected]>
Date: Tue May 31 19:14:42 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue May 31 19:14:42 2011 +0200
Fixed redirects after map add/rename/delete
---
ChangeLog | 2 ++
share/frontend/nagvis-js/defines/nagvis-js.php | 1 -
share/server/core/classes/CoreModMap.php | 10 +++++-----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7765a74..40dcbe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@
Core
* Added omd_install.sh to install NagVis to the local/ path of OMD sites
(ONLY FOR TESTING!!!)
+ * Main Config: [paths] "wuijs" and "htmlwuijs" are now deprecated
* Bugfix: NDO Backend: Fixed wrong SQL syntax in getHostState function
+ * Bugfix: Fixed redirects after map add/rename/delete
Frontend
* Bugfix: Added missing controls to services which are displayed as gadgets
diff --git a/share/frontend/nagvis-js/defines/nagvis-js.php
b/share/frontend/nagvis-js/defines/nagvis-js.php
index 069cb74..7ee4040 100644
--- a/share/frontend/nagvis-js/defines/nagvis-js.php
+++ b/share/frontend/nagvis-js/defines/nagvis-js.php
@@ -33,6 +33,5 @@
set_include_path(
get_include_path()
.PATH_SEPARATOR.'../../frontend/nagvis-js/classes/'
- .PATH_SEPARATOR.'../../frontend/wui/includes/classes/'
);
?>
diff --git a/share/server/core/classes/CoreModMap.php
b/share/server/core/classes/CoreModMap.php
index ecb6788..cf83101 100644
--- a/share/server/core/classes/CoreModMap.php
+++ b/share/server/core/classes/CoreModMap.php
@@ -121,7 +121,7 @@ class CoreModMap extends CoreModule {
$this->handleResponse('handleResponseAdd', 'doAdd',
$this->CORE->getLang()->getText('The map has been created.'),
$this->CORE->getLang()->getText('The map could not be created.'),
- 1,
$this->htmlBase.'/frontend/wui/index.php?mod=Map&act=edit&show='.$_POST['map']);
+ 1,
$this->htmlBase.'/frontend/nagvis-js/index.php?mod=Map&act=view&show='.$_POST['map']);
break;
case 'doRename':
// if renamed map is open, redirect to new name
@@ -136,7 +136,7 @@ class CoreModMap extends CoreModule {
$this->handleResponse('handleResponseRename', 'doRename',
$this->CORE->getLang()->getText('The map has been renamed.'),
$this->CORE->getLang()->getText('The map could not be renamed.'),
- 1,
$this->htmlBase.'/frontend/wui/index.php?mod=Map&act=edit&show='.$map);
+ 1,
$this->htmlBase.'/frontend/nagvis-js/index.php?mod=Map&act=view&show='.$map);
break;
case 'doDelete':
// if deleted map is open, redirect to WUI main page
@@ -144,9 +144,9 @@ class CoreModMap extends CoreModule {
$current = $FHANDLER->get('map_current');
$map = $FHANDLER->get('map');
if($current == 'undefined' || $current == '' || $current
== $map)
- $url = $this->htmlBase.'/frontend/wui/index.php';
+ $url = $this->htmlBase.'/frontend/nagvis-js/index.php';
else
- $url =
$this->htmlBase.'/frontend/wui/index.php?mod=Map&act=edit&show='.$current;
+ $url =
$this->htmlBase.'/frontend/nagvis-js/index.php?mod=Map&act=view&show='.$current;
$this->handleResponse('handleResponseDelete', 'doDelete',
$this->CORE->getLang()->getText('The map has been deleted.'),
@@ -998,4 +998,4 @@ class CoreModMap extends CoreModule {
return $MAP->parseObjectsJson($aVals['ty']);
}
}
-?>
\ No newline at end of file
+?>
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
