summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2013-09-30 13:13:06 +0200
committerMartin Kosek <mkosek@redhat.com>2013-10-03 09:13:45 +0200
commit6a124160a56bba66ffd7290ed0f111e72f36b521 (patch)
treeb0d61d65b192b8b8defc4627a6892f9655eca288
parent295ce7bf18510efbe7d170887eb4e6956d3db035 (diff)
downloadfreeipa-6a124160a56bba66ffd7290ed0f111e72f36b521.tar.gz
freeipa-6a124160a56bba66ffd7290ed0f111e72f36b521.tar.xz
freeipa-6a124160a56bba66ffd7290ed0f111e72f36b521.zip
Fix enablement of automount map type selector
Map type radio used old way of defining that its value should not be used in add command. Recent patch related to 'enable' attribute hardened/fixed the behavior of radio widgets so they are disabled in UI as well when enabled==false. Automount did not reflect this change. https://fedorahosted.org/freeipa/ticket/3954
-rw-r--r--install/ui/src/freeipa/automount.js2
-rw-r--r--ipatests/test_webui/test_automount.py36
2 files changed, 37 insertions, 1 deletions
diff --git a/install/ui/src/freeipa/automount.js b/install/ui/src/freeipa/automount.js
index ef1823e1b..eae6a4653 100644
--- a/install/ui/src/freeipa/automount.js
+++ b/install/ui/src/freeipa/automount.js
@@ -117,7 +117,7 @@ return {
{
$type: 'radio',
name: 'method',
- enabled: false, //don't use value in add command
+ flags: ['no_command'],
label: '@i18n:objects.automountmap.map_type',
options: [
{
diff --git a/ipatests/test_webui/test_automount.py b/ipatests/test_webui/test_automount.py
index a11150ad9..0ab33d7fd 100644
--- a/ipatests/test_webui/test_automount.py
+++ b/ipatests/test_webui/test_automount.py
@@ -101,5 +101,41 @@ class test_automount(UI_driver):
self.navigate_by_breadcrumb(LOC_PKEY)
self.delete_record(MAP_PKEY)
+ ## test indirect maps
+ direct_pkey = 'itest-direct'
+ indirect_pkey = 'itest-indirect'
+
+ self.add_record(LOC_ENTITY,
+ {
+ 'pkey': direct_pkey,
+ 'add': [
+ ('radio', 'method', 'add'),
+ ('textbox', 'automountmapname', direct_pkey),
+ ('textarea', 'description', 'foobar'),
+ ],
+ },
+ facet='maps',
+ navigate=False)
+
+ self.add_record(LOC_ENTITY,
+ {
+ 'pkey': indirect_pkey,
+ 'add': [
+ ('radio', 'method', 'add_indirect'),
+ ('textbox', 'automountmapname', indirect_pkey),
+ ('textarea', 'description', 'foobar'),
+ ('textbox', 'key', 'baz'),
+ ('textbox', 'parentmap', direct_pkey),
+ ],
+ },
+ facet='maps',
+ navigate=False)
+
+ self.assert_record(direct_pkey)
+ self.assert_record(indirect_pkey)
+
+ # delete
+ self.delete_record(direct_pkey)
+ self.delete_record(indirect_pkey)
self.navigate_by_breadcrumb('Automount Locations')
self.delete_record(LOC_PKEY)