summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2010-11-29 11:52:08 -0600
committerEndi Sukma Dewata <edewata@redhat.com>2010-11-29 21:13:34 -0500
commitdf48c9cf7114eca33a7586f2208e406ce28d0168 (patch)
tree15652343ec9cba5a3ac7079bcb90b45583dce908
parent7b91e9d83dd12c18ebe5d57f3fb86e1c27703b58 (diff)
downloadfreeipa-df48c9cf7114eca33a7586f2208e406ce28d0168.tar.gz
freeipa-df48c9cf7114eca33a7586f2208e406ce28d0168.tar.xz
freeipa-df48c9cf7114eca33a7586f2208e406ce28d0168.zip
Fixed navigation problem with nested entities.
Replaced _entity with -entity in IPA.tab_state(). Replaced sudo-entity with sudorule-entity.
-rw-r--r--install/static/navigation.js2
-rwxr-xr-xinstall/static/sudocmd.js4
-rwxr-xr-xinstall/static/sudocmdgroup.js4
-rwxr-xr-xinstall/static/sudorule.js4
-rw-r--r--install/static/webui.js2
5 files changed, 8 insertions, 8 deletions
diff --git a/install/static/navigation.js b/install/static/navigation.js
index 240ee9592..98c13a923 100644
--- a/install/static/navigation.js
+++ b/install/static/navigation.js
@@ -138,7 +138,7 @@ function _nav_update_tabs(nls, container,depth)
// TODO: do not hard-code
if (entity_name == 'hbac' && nav_get_state('hbac-entity')) entity_name = nav_get_state('hbac-entity');
- if (entity_name == 'sudorule' && nav_get_state('sudo-entity')) entity_name = nav_get_state('sudo-entity');
+ if (entity_name == 'sudorule' && nav_get_state('sudorule-entity')) entity_name = nav_get_state('sudorule-entity');
var entity = IPA.get_entity(entity_name);
entity.setup(container2);
diff --git a/install/static/sudocmd.js b/install/static/sudocmd.js
index 4255a31e3..b4492c254 100755
--- a/install/static/sudocmd.js
+++ b/install/static/sudocmd.js
@@ -125,7 +125,7 @@ function ipa_sudocmd_search_facet(spec) {
var li = $('li[title=sudorule]', action_panel);
li.click(function() {
var state = {};
- state['sudo-entity'] = 'sudorule';
+ state['sudorule-entity'] = 'sudorule';
nav_push_state(state);
return false;
});
@@ -133,7 +133,7 @@ function ipa_sudocmd_search_facet(spec) {
li = $('li[title=sudocmdgroup]', action_panel);
li.click(function() {
var state = {};
- state['sudo-entity'] = 'sudocmdgroup';
+ state['sudorule-entity'] = 'sudocmdgroup';
nav_push_state(state);
return false;
});
diff --git a/install/static/sudocmdgroup.js b/install/static/sudocmdgroup.js
index 6fddafb15..2e53ce791 100755
--- a/install/static/sudocmdgroup.js
+++ b/install/static/sudocmdgroup.js
@@ -140,7 +140,7 @@ function ipa_sudocmdgroup_search_facet(spec) {
var li = $('li[title=sudorule]', action_panel);
li.click(function() {
var state = {};
- state['sudo-entity'] = 'sudorule';
+ state['sudorule-entity'] = 'sudorule';
nav_push_state(state);
return false;
});
@@ -148,7 +148,7 @@ function ipa_sudocmdgroup_search_facet(spec) {
li = $('li[title=sudocmd]', action_panel);
li.click(function() {
var state = {};
- state['sudo-entity'] = 'sudocmd';
+ state['sudorule-entity'] = 'sudocmd';
nav_push_state(state);
return false;
});
diff --git a/install/static/sudorule.js b/install/static/sudorule.js
index f936ebcde..023cafde2 100755
--- a/install/static/sudorule.js
+++ b/install/static/sudorule.js
@@ -124,7 +124,7 @@ function ipa_sudorule_search_facet(spec) {
var li = $('li[title=sudocmd]', action_panel);
li.click(function() {
var state = {};
- state['sudo-entity'] = 'sudocmd';
+ state['sudorule-entity'] = 'sudocmd';
nav_push_state(state);
return false;
});
@@ -132,7 +132,7 @@ function ipa_sudorule_search_facet(spec) {
li = $('li[title=sudocmdgroup]', action_panel);
li.click(function() {
var state = {};
- state['sudo-entity'] = 'sudocmdgroup';
+ state['sudorule-entity'] = 'sudocmdgroup';
nav_push_state(state);
return false;
});
diff --git a/install/static/webui.js b/install/static/webui.js
index 093d32b22..0e3adb27d 100644
--- a/install/static/webui.js
+++ b/install/static/webui.js
@@ -83,7 +83,7 @@ IPA.tab_state = function(entity_name){
if (nested_entities[nested_index].name === entity_name){
state.navigation = top_tab_index;
state[top_tab.name] = subtab_index;
- state[ top_tab.children[subtab_index].name+'_entity'] = entity_name;
+ state[ top_tab.children[subtab_index].name+'-entity'] = entity_name;
return state;
}
}