Prompt for nameserver IP address in dnszone-add

Prompt for nameserver IP address in interactive mode of dnszone-add.

Add a corresponding field to dnszone creation dialog in the web UI.

This parameter is required if and only if:
* New zone is a forward zone
* Nameserver is defined inside the new zone

Add a new unit test to cover this functionality.

https://fedorahosted.org/freeipa/ticket/3603
This commit is contained in:
Ana Krivokapic authored and Martin Kosek committed 2013-05-16 11:01:33 +02:00
1 parent 78774916c8
commit c5bfeb1ed0
5 files changed
+161

No files matched your search

+58
View File
@@ -299,6 +299,11 @@ return {
name: 'other',
fields: [
'idnssoamname',
{
name: 'ip_address',
validators: [ 'ip_address' ],
metadata: '@mc-opt:dnszone_add:ip_address'
},
{
name: 'idnssoarname',
required: false
@@ -576,11 +581,64 @@ IPA.dnszone_adder_dialog = function(spec) {
var that = IPA.entity_adder_dialog(spec);
function ends_with(str, suffix) {
return str.indexOf(suffix, str.length - suffix.length) !== -1;
}
var init = function() {
var zone_w = that.fields.get_field('idnsname').widget;
var reverse_zone_w = that.fields.get_field('name_from_ip').widget;
var ns_w = that.fields.get_field('idnssoamname').widget;
zone_w.value_changed.attach(that.check_ns_ip);
reverse_zone_w.value_changed.attach(that.check_ns_ip);
ns_w.value_changed.attach(that.check_ns_ip);
};
that.check_ns_ip = function() {
var ip_address_f = that.fields.get_field('ip_address');
var zone_w = that.fields.get_field('idnsname').widget;
var ns_w = that.fields.get_field('idnssoamname').widget;
var zone = zone_w.save()[0] || '';
var ns = ns_w.save()[0] || '';
var zone_is_reverse = !zone_w.is_enabled() ||
ends_with(zone, '.in-addr.arpa.') ||
ends_with(zone, '.ip6.arpa.');
var relative_ns = true;
var ns_in_zone = false;
if (ns && ns[ns.length-1] === '.') {
relative_ns = false;
ns = ns.slice(0, -1);
}
if (zone && zone[zone.length-1] === '.') {
zone = zone.slice(0, -1);
}
if (ns && zone && ends_with(ns, '.' + zone)) {
ns_in_zone = true;
}
if (!zone_is_reverse && (relative_ns || ns_in_zone)) {
ip_address_f.set_enabled(true);
ip_address_f.set_required(true);
} else {
ip_address_f.reset();
ip_address_f.set_required(false);
ip_address_f.set_enabled(false);
}
};
that.create = function() {
that.entity_adder_dialog_create();
that.container.addClass('dnszone-adder-dialog');
};
init();
return that;
};
+4
View File
@@ -303,6 +303,10 @@ IPA.text_widget = function(spec) {
}
};
that.is_enabled = function(value) {
return !that.input.prop('disabled');
};
that.set_enabled = function(value) {
that.input.prop('disabled', !value);