[checkmk-commits] 5544 LDAP: It is now possible to clone LDAP connections

Module: check_mk Branch: master Commit: 9f709516c721a8885eb13f3b5c87e18d0f0b2be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f709516c721a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 11:33:11 2017 +0100 5544 LDAP: It is now possible to clone LDAP connections Change-Id: Ibcf67dfe63878ff0afef0b4b868362d814b6bd2a --- .werks/5544 | 10 ++++++++++ web/htdocs/wato.py | 20 ++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/5544 b/.werks/5544 new file mode 100644 index 0000000..eb6ce1d --- /dev/null +++ b/.werks/5544 @@ -0,0 +1,10 @@ +Title: LDAP: It is now possible to clone LDAP connections +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511778771 +Class: feature + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 14f0c61..5990984 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6097,7 +6097,7 @@ def add_ldap_change(action_name, text): def mode_ldap_config(phase): - title = _("LDAP Connections") + title = _("LDAP connections") if phase == "title": return title @@ -6148,8 +6148,10 @@ def mode_ldap_config(phase): edit_url = watolib.folder_preserving_link([("mode", "edit_ldap_connection"), ("id", connection["id"])]) delete_url = make_action_link([("mode", "ldap_config"), ("_delete", nr)]) drag_url = make_action_link([("mode", "ldap_config"), ("_move", nr)]) + clone_url = watolib.folder_preserving_link([("mode", "edit_ldap_connection"), ("clone", connection["id"])]) html.icon_button(edit_url, _("Edit this LDAP connection"), "edit") + html.icon_button(clone_url, _("Create a copy of this LDAP connection"), "clone") html.element_dragger("tr", base_url=drag_url) html.icon_button(delete_url, _("Delete this LDAP connection"), "delete") @@ -6185,18 +6187,24 @@ class ModeEditLDAPConnection(WatoMode): self._connections = userdb.load_connection_config(lock=html.is_transaction()) if self._connection_id == None: + clone_id = html.var("clone") + if clone_id is not None: + self._connection_cfg = self._get_connection_cfg_and_index(clone_id)[0] + self._new = True return self._new = False + self._connection_cfg, self._connection_nr = self._get_connection_cfg_and_index(self._connection_id) + - for nr, c in enumerate(self._connections): - if c['id'] == self._connection_id: - self._connection_cfg = c - self._connection_nr = nr + def _get_connection_cfg_and_index(self, connection_id): + for index, cfg in enumerate(self._connections): + if cfg['id'] == connection_id: + return cfg, index if not self._connection_cfg: - raise MKUserError(None, _("The given connection does not exist.")) + raise MKUserError(None, _("The requested connection does not exist.")) def title(self):