On 04/14/2016 02:03 PM, Martin Basti wrote:
On 14.04.2016 13:03, Pavel Vomacka wrote:
Hello,
The first patch (0015) adds the checkbox to the dns zone adder dialog.
The second patch (0016) adds the 'skip overlap check' checkbox to the
dns forward zone adder dialog. This patch requires the previous one.
The patch 0016 might not be used in case that the dns forward zone
dialog shouldn't contain that checkbox.
--
Pavel^3 Vomacka
Can we add hint to webUI what 'skip overlap check' means? Maybe
description from ipa dns[forward]zone-add --help.
Martin^2
Yes, it is included in these new pathes.
--
Pavel^3 Vomacka
>From 84259dcf7c71e7dab67e00f30a70dd04e53ad8f9 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Thu, 14 Apr 2016 12:21:49 +0200
Subject: [PATCH 1/2] Add 'skip overlap check' checkbox into add zone dialog
https://fedorahosted.org/freeipa/ticket/5773
---
install/ui/src/freeipa/dns.js | 13 +++++++++++++
install/ui/test/data/ipa_init.json | 1 +
ipalib/plugins/internal.py | 1 +
3 files changed, 15 insertions(+)
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index 8dce6a96d875652b225a07a3861bb37e5ed310f3..bb32dd171d410bd78e44f9500ea7af214ba46ba2 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -298,6 +298,19 @@ return {
validators: ['network']
}
]
+ },
+ {
+ name: 'options',
+ fields: [
+ {
+ $type: 'checkbox',
+ name: 'skip_overlap_check',
+ label: '@i18n:objects.dnszone.skip_overlap_check',
+ tooltip: {
+ title: '@mc-opt:dnszone_add:skip_overlap_check:doc'
+ }
+ }
+ ]
}
],
policies: [
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 7bd74dc815273e697b8dddb2b250b286410ba845..1b9b69ff909a9668c1e1867008459d25d5e062a9 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -324,6 +324,7 @@
"remove_permission": "Remove Permission",
"remove_permission_confirm": "Are you sure you want to remove permission for DNS Zone ${object}?",
"skip_dns_check": "Skip DNS check",
+ "skip_overlap_check": "Skip overlap check",
"soamname_change_message": "Do you want to check if new authoritative nameserver address is in DNS",
"soamname_change_title": "Authoritative nameserver change"
},
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index 2c0d8b1109da6c760cde14f4c4decff869be3cf5..54871f76de99d92f0f23129b4d636cc4fccfbb8b 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -469,6 +469,7 @@ class i18n_messages(Command):
"remove_permission": _("Remove Permission"),
"remove_permission_confirm": _("Are you sure you want to remove permission for DNS Zone ${object}?"),
"skip_dns_check": _("Skip DNS check"),
+ "skip_overlap_check": _("Skip overlap check"),
"soamname_change_message": _("Do you want to check if new authoritative nameserver address is in DNS"),
"soamname_change_title": _("Authoritative nameserver change"),
},
--
2.5.5
>From ee95aa6edec0f1baeb00854f098b9ddc63841e17 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Thu, 14 Apr 2016 12:48:02 +0200
Subject: [PATCH 2/2] Add 'skip overlap check' checkbox to the add dns forward
zone dialog
https://fedorahosted.org/freeipa/ticket/5773
---
install/ui/src/freeipa/dns.js | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index bb32dd171d410bd78e44f9500ea7af214ba46ba2..8bfc23a1ac7fdd47c917091126f6298e323f1dcf 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -470,6 +470,19 @@ return {
]
}
]
+ },
+ {
+ name: 'options',
+ fields: [
+ {
+ $type: 'checkbox',
+ name: 'skip_overlap_check',
+ label: '@i18n:objects.dnszone.skip_overlap_check',
+ tooltip: {
+ title: '@mc-opt:dnsforwardzone_add:skip_overlap_check:doc'
+ }
+ }
+ ]
}
],
policies: [
--
2.5.5
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
