From 5a428608beb3752b111b558ba2355ef112a057f1 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Wed, 28 May 2014 14:45:57 +0200 Subject: webui: move RPC result extraction logic to Adapter It enables declarative extraction of values from partial results of a batch commands and also further extensibility in custom adapters. The default adapter has detection logic for this extraction so it can use bare record or extract data from normal or batch RPC command. Minor change of user plugin fixed: https://fedorahosted.org/freeipa/ticket/4355 Reviewed-By: Endi Sukma Dewata --- install/ui/src/freeipa/service.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'install/ui/src/freeipa/service.js') diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js index 82f9ab3b3..4b04878c0 100644 --- a/install/ui/src/freeipa/service.js +++ b/install/ui/src/freeipa/service.js @@ -269,7 +269,8 @@ IPA.service_adder_dialog = function(spec) { }; IPA.service_name_adapter = declare([field_mod.Adapter], { - load: function(record) { + load: function(data) { + var record = this.get_record(data); var krbprincipalname = record.krbprincipalname[0]; var value = krbprincipalname.replace(/\/.*$/, ''); return [value]; @@ -277,7 +278,8 @@ IPA.service_name_adapter = declare([field_mod.Adapter], { }); IPA.service_host_adapter = declare([field_mod.Adapter], { - load: function(record) { + load: function(data) { + var record = this.get_record(data); var krbprincipalname = record.krbprincipalname[0]; var value = krbprincipalname.replace(/^.*\//, '').replace(/@.*$/, ''); return [value]; -- cgit