diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2014-05-28 14:45:57 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2014-06-16 15:41:38 +0200 |
commit | 5a428608beb3752b111b558ba2355ef112a057f1 (patch) | |
tree | 61b4bd573e4888cbd7f18a87ac867dfa9be599e7 /install/ui/src/freeipa/dns.js | |
parent | 521df77744233f424ec68caa68548bede6e575fb (diff) | |
download | freeipa-5a428608beb3752b111b558ba2355ef112a057f1.tar.gz freeipa-5a428608beb3752b111b558ba2355ef112a057f1.tar.xz freeipa-5a428608beb3752b111b558ba2355ef112a057f1.zip |
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 <edewata@redhat.com>
Diffstat (limited to 'install/ui/src/freeipa/dns.js')
-rw-r--r-- | install/ui/src/freeipa/dns.js | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 0dd84e686..aa1ac15e6 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -339,12 +339,6 @@ IPA.dnszone_details_facet = function(spec, no_init) { that.permission_load = IPA.observer(); that.permission_status = 'unknown'; // [unknown, set, none] - that.refresh_on_success = function(data, text_status, xhr) { - // do not load data from batch - - that.show_content(); - }; - that.create_refresh_command = function() { var pkey = that.get_pkey(); @@ -354,14 +348,6 @@ IPA.dnszone_details_facet = function(spec, no_init) { }); var dnszone_command = that.details_facet_create_refresh_command(); - - dnszone_command.on_success = function(data, text_status, xhr) { - // create data that mimics dnszone-show output - var dnszone_data = {}; - dnszone_data.result = data; - that.load(dnszone_data); - }; - batch.add_command(dnszone_command); var permission_name = IPA.dns.zone_permission_name.replace('${dnszone}', pkey); @@ -1608,8 +1594,9 @@ IPA.dns.record_type_adapter = declare([field_mod.Adapter], { separator: ';', - load: function(record) { + load: function(rpcdata) { + var record = this.get_record(rpcdata); var data = {}; data.idnsname = record.idnsname; @@ -2060,7 +2047,7 @@ IPA.dns.netaddr_adapter = declare([field_mod.Adapter], { separator: ';', - load: function(record) { + load: function(data) { var value = this.inherited(arguments)[0]; if (value) { if (value[value.length-1] === this.separator) { |