summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2012-11-02 14:02:39 +0100
committerPetr Vobornik <pvoborni@redhat.com>2012-11-09 17:46:04 +0100
commit1bf537db9e6e5a66a7c3ce58019693098ff090f7 (patch)
tree13477b310af6f365318f7eaaef0e80d30c98ae3c
parent610594156eafee2d0ced3a4d0484e4436b6f973d (diff)
downloadfreeipa.git-1bf537db9e6e5a66a7c3ce58019693098ff090f7.tar.gz
freeipa.git-1bf537db9e6e5a66a7c3ce58019693098ff090f7.tar.xz
freeipa.git-1bf537db9e6e5a66a7c3ce58019693098ff090f7.zip
Web UI: disable global forwarding per zone
Web UI part of 'disable global forwaring per zone' effort. Option "Forwarding disabled" was added to 'DNS global config' and 'DNS zone' forwarding policy. It corresponds to 'none' value of idnsforwardpolicy. https://fedorahosted.org/freeipa/ticket/3209
-rw-r--r--install/ui/dns.js8
-rw-r--r--install/ui/test/data/ipa_init.json1
-rw-r--r--ipalib/plugins/internal.py1
3 files changed, 10 insertions, 0 deletions
diff --git a/install/ui/dns.js b/install/ui/dns.js
index 43703e03..fd6127d3 100644
--- a/install/ui/dns.js
+++ b/install/ui/dns.js
@@ -72,6 +72,10 @@ IPA.dns.config_entity = function(spec) {
{
value: 'only',
label: IPA.messages.objects.dnsconfig.forward_only
+ },
+ {
+ value: 'none',
+ label: IPA.messages.objects.dnsconfig.forward_none
}
]
},
@@ -201,6 +205,10 @@ IPA.dns.zone_entity = function(spec) {
{
value: 'only',
label: IPA.messages.objects.dnsconfig.forward_only
+ },
+ {
+ value: 'none',
+ label: IPA.messages.objects.dnsconfig.forward_none
}
]
},
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 2b95c91d..41f2c627 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -222,6 +222,7 @@
"delegation": {},
"dnsconfig": {
"forward_first": "Forward first",
+ "forward_none": "Forwarding disabled",
"forward_only": "Forward only",
"options": "Options"
},
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index 6195ddd9..cfb5d60f 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -359,6 +359,7 @@ class i18n_messages(Command):
},
"dnsconfig": {
"forward_first": _("Forward first"),
+ "forward_none": _("Forwarding disabled"),
"forward_only": _("Forward only"),
"options": _("Options"),
},