Module: check_mk
Branch: master
Commit: 598232e5a128f7747b1a384649ccb62f021d4213
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=598232e5a128f7…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Apr 15 16:28:51 2016 +0200
3381 FIX Folder property editing: Redirect back to folder when coming from folder
---
.werks/3381 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/3381 b/.werks/3381
new file mode 100644
index 0000000..92dc63f
--- /dev/null
+++ b/.werks/3381
@@ -0,0 +1,10 @@
+Title: Folder property editing: Redirect back to folder when coming from folder
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1460730504
+
+
diff --git a/ChangeLog b/ChangeLog
index b2b16de..228ec0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -272,6 +272,7 @@
* 3377 FIX: Network scan: The scan was broken when having no regex exclude patterns
since 1.2.8b9
* 3378 FIX: Fixed too long contact group names overflowing WATO folders
* 3379 FIX: Fixed error resotring WATO snapshot without Check_MK configuration
+ * 3381 FIX: Folder property editing: Redirect back to folder when coming from folder
Notifications:
* 3263 Notifications: allow users to restrict by their contact groups...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index ca022e9..4688418 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -361,7 +361,7 @@ def mode_folder(phase):
html.context_button(_("Rulesets"),
folder_preserving_link([("mode", "ruleeditor")]),
"rulesets")
html.context_button(_("Manual Checks"),
folder_preserving_link([("mode", "static_checks")]),
"static_checks")
if folder.may("read"):
- html.context_button(_("Folder Properties"), folder.edit_url(),
"edit")
+ html.context_button(_("Folder Properties"),
folder.edit_url(backfolder=folder), "edit")
if not folder.locked_subfolders() and
config.may("wato.manage_folders") and folder.may("write"):
html.context_button(_("New folder"),
folder.url([("mode", "newfolder")]), "newfolder")
if not folder.locked_hosts() and config.may("wato.manage_hosts")
and folder.may("write"):