summaryrefslogtreecommitdiffstats
path: root/install/ui/field.js
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-11-07 14:21:45 -0600
committerPetr Vobornik <pvoborni@redhat.com>2011-12-21 14:59:49 +0100
commit5fc064f13e44812042a617a322bcd6111d2b39b2 (patch)
treef89503069c5d4eabbb940aff34b9733607ce93d2 /install/ui/field.js
parent49e5555b11d0bee814bce807acacbfeb381379f1 (diff)
downloadfreeipa-5fc064f13e44812042a617a322bcd6111d2b39b2.tar.gz
freeipa-5fc064f13e44812042a617a322bcd6111d2b39b2.tar.xz
freeipa-5fc064f13e44812042a617a322bcd6111d2b39b2.zip
Refactored entity object resolution.
The IPA.get_entity() has been modified to accept either entity name or entity object. If it receives an entity object it will return the object itself. Otherwise, it will resolve the name in the entity registry. The other_entity variables have been modified to store a reference to the entity object instead of its name. The test cases have been modified to use real entity objects instead of just the names. Ticket #2042
Diffstat (limited to 'install/ui/field.js')
-rw-r--r--install/ui/field.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/install/ui/field.js b/install/ui/field.js
index 381f2360e..18a52c9b6 100644
--- a/install/ui/field.js
+++ b/install/ui/field.js
@@ -29,7 +29,7 @@ IPA.field = function(spec) {
var that = {};
- that.entity = spec.entity;
+ that.entity = IPA.get_entity(spec.entity);
that.container = null;
that.name = spec.name;
that.label = spec.label;
@@ -532,7 +532,7 @@ IPA.link_field = function(spec) {
var that = IPA.field(spec);
- var other_entity = spec.other_entity;
+ that.other_entity = IPA.get_entity(spec.other_entity);
function other_pkeys () {
return that.entity.get_primary_key();
@@ -542,7 +542,7 @@ IPA.link_field = function(spec) {
that.on_link_clicked = function() {
IPA.nav.show_entity_page(
- IPA.get_entity(other_entity),
+ that.other_entity,
'default',
that.other_pkeys());
};
@@ -556,7 +556,7 @@ IPA.link_field = function(spec) {
that.check_entity_link = function() {
IPA.command({
- entity: other_entity,
+ entity: that.other_entity.name,
method: 'show',
args: that.other_pkeys(),
options: {},