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
>From f1ce4ef65fbfd1f4f05c34b4bb89e0de294fa909 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Thu, 14 Apr 2016 12:21:49 +0200
Subject: [PATCH] Add 'skip overlap check' checkbox into add zone dialog

https://fedorahosted.org/freeipa/ticket/5773
---
 install/ui/src/freeipa/dns.js      | 10 ++++++++++
 install/ui/test/data/ipa_init.json |  1 +
 ipalib/plugins/internal.py         |  1 +
 3 files changed, 12 insertions(+)

diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index 8dce6a96d875652b225a07a3861bb37e5ed310f3..d9df4b5166fde0647335bd74651d43e850721d36 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -298,6 +298,16 @@ return {
                         validators: ['network']
                     }
                 ]
+            },
+            {
+                name: 'options',
+                fields: [
+                    {
+                        $type: 'checkbox',
+                        name: 'skip_overlap_check',
+                        label: '@i18n:objects.dnszone.skip_overlap_check'
+                    }
+                ]
             }
         ],
         policies: [
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 852b953736da0ccb8a7803259e2bd5d4c4108ab9..eaa2caafff6833073fe67d3845d8180b6142704d 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 7156d4f47004dd702d3896ca736cc1f42227a321..59c35a332309d806c4eae5815f24b27b7b195909 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 bcb7de3dddc090a10778a2bb68b88016bbd31512 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Thu, 14 Apr 2016 12:48:02 +0200
Subject: [PATCH] Add 'skip overlap check' checkbox to the add dns forward zone
 dialog

https://fedorahosted.org/freeipa/ticket/5773
---
 install/ui/src/freeipa/dns.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index d9df4b5166fde0647335bd74651d43e850721d36..495cad5583bbd6f409e4305c3c67d44e02fa3a61 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -467,6 +467,16 @@ return {
                         ]
                     }
                 ]
+            },
+            {
+                name: 'options',
+                fields: [
+                    {
+                        $type: 'checkbox',
+                        name: 'skip_overlap_check',
+                        label: '@i18n:objects.dnszone.skip_overlap_check'
+                    }
+                ]
             }
         ],
         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

Reply via email to