URL: https://github.com/freeipa/freeipa/pull/651 Author: pvomacka Title: #651: WebUI: Fix showing vault in selfservice view Action: opened
PR body: """ Vaults menu item was shown even when the KRA service was not installed. That was caused by different path to the menu item in admin's view and in selfservice view. The path is now set correctly for both situations. 'network_service/vault' for admin's view and 'vault' for selfservice view. https://pagure.io/freeipa/issue/6812 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/651/head:pr651 git checkout pr651
From aa9ecdb5411a6fd34d685807a58979f4953f36c0 Mon Sep 17 00:00:00 2001 From: Pavel Vomacka <pvoma...@redhat.com> Date: Fri, 24 Mar 2017 10:19:21 +0100 Subject: [PATCH] WebUI: Fix showing vault in selfservice view Vaults menu item was shown even when the KRA service was not installed. That was caused by different path to the menu item in admin's view and in selfservice view. The path is now set correctly for both situations. 'network_service/vault' for admin's view and 'vault' for selfservice view. https://pagure.io/freeipa/issue/6812 --- install/ui/src/freeipa/navigation/menu_spec.js | 1 + install/ui/src/freeipa/vault.js | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/install/ui/src/freeipa/navigation/menu_spec.js b/install/ui/src/freeipa/navigation/menu_spec.js index 4f78e4b..2eba53a 100644 --- a/install/ui/src/freeipa/navigation/menu_spec.js +++ b/install/ui/src/freeipa/navigation/menu_spec.js @@ -326,6 +326,7 @@ nav.self_service = { { entity: 'user' }, { entity: 'otptoken' }, { + name: 'vault', entity: 'vault', facet: 'search', children: [ diff --git a/install/ui/src/freeipa/vault.js b/install/ui/src/freeipa/vault.js index b5cdc81..36a4838 100644 --- a/install/ui/src/freeipa/vault.js +++ b/install/ui/src/freeipa/vault.js @@ -809,9 +809,11 @@ vault.config_sidebar_policy = function(spec) { vault.remove_vault_menu_item = function() { - if (!IPA.vault_enabled) { - menu.remove_item('network_services/vault'); - } + if (IPA.vault_enabled) return; + + var menu_location = IPA.is_selfservice ? 'vault' : 'network_services/vault'; + + menu.remove_item(menu_location); }; vault.my_vault_spec = make_my_vault_spec();
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
