summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorAdam Young <ayoung@redhat.com>2011-06-29 13:42:13 -0400
committerEndi S. Dewata <edewata@redhat.com>2011-06-29 21:14:16 +0000
commit870e430b653988e8f155a31e7214480b8af5cf13 (patch)
tree791f325f583c7c679d3b147813b12c00acbb9f61 /install
parentb8b2ac53573620711ce1acfce34a919ffa23e143 (diff)
downloadfreeipa-870e430b653988e8f155a31e7214480b8af5cf13.tar.gz
freeipa-870e430b653988e8f155a31e7214480b8af5cf13.tar.xz
freeipa-870e430b653988e8f155a31e7214480b8af5cf13.zip
undefined pkeys https://fedorahosted.org/freeipa/ticket/1399
Thereis not metatdata defined pkey for config, so we need to short circuit the logic that uses the metatdata pkey to look up the key from the hashurl.
Diffstat (limited to 'install')
-rw-r--r--install/ui/details.js3
-rw-r--r--install/ui/entity.js6
2 files changed, 8 insertions, 1 deletions
diff --git a/install/ui/details.js b/install/ui/details.js
index afab5a7e7..17f9ab5ac 100644
--- a/install/ui/details.js
+++ b/install/ui/details.js
@@ -325,6 +325,9 @@ IPA.details_facet = function(spec) {
pkey.push(that.pkey);
} else {
var pkey_name = IPA.metadata.objects[that.entity_name].primary_key;
+ if (!pkey_name){
+ return pkey;
+ }
var pkey_val = that.data[pkey_name];
if (pkey_val instanceof Array) {
pkey.push(pkey_val[0]);
diff --git a/install/ui/entity.js b/install/ui/entity.js
index 7fa00f1fa..82edb7bbe 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -584,7 +584,11 @@ IPA.entity = function (spec) {
var current_entity = that;
current_entity = current_entity.containing_entity;
while(current_entity !== null){
- pkey.unshift(IPA.nav.get_state(current_entity.name+'-pkey'));
+
+ var key = IPA.nav.get_state(current_entity.name+'-pkey');
+ if (key){
+ pkey.unshift(key);
+ }
current_entity = current_entity.containing_entity;
}
return pkey;