summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Young <ayoung@redhat.com>2011-06-30 13:45:35 -0400
committerAdam Young <ayoung@redhat.com>2011-06-30 22:26:19 -0400
commit9d8ddb5d46e13d3e6c53ae968465ecfd53948425 (patch)
tree286085fcf85bbd0bf10be904378ec492c3c70790
parent2a527234656a08342259ebc30af38b68a592ba8a (diff)
downloadfreeipa-9d8ddb5d46e13d3e6c53ae968465ecfd53948425.zip
freeipa-9d8ddb5d46e13d3e6c53ae968465ecfd53948425.tar.gz
freeipa-9d8ddb5d46e13d3e6c53ae968465ecfd53948425.tar.xz
config widgets entity select default group checkbox for migration
-rw-r--r--API.txt2
-rw-r--r--install/ui/serverconfig.js11
-rw-r--r--install/ui/test/data/ipa_init.json23
-rw-r--r--install/ui/widget.js7
-rw-r--r--ipalib/plugins/config.py2
5 files changed, 31 insertions, 14 deletions
diff --git a/API.txt b/API.txt
index c89b09d..5f42330 100644
--- a/API.txt
+++ b/API.txt
@@ -337,7 +337,7 @@ option: Int('ipasearchtimelimit', validate_searchtimelimit, attribute=True, auto
option: Int('ipasearchrecordslimit', attribute=True, autofill=False, cli_name='searchrecordslimit', label=Gettext('Search size limit', domain='ipa', localedir=None), minvalue=-1, multivalue=False, required=False)
option: IA5Str('ipausersearchfields', attribute=True, autofill=False, cli_name='usersearch', label=Gettext('User search fields', domain='ipa', localedir=None), multivalue=False, required=False)
option: IA5Str('ipagroupsearchfields', attribute=True, autofill=False, cli_name='groupsearch', label='Group search fields', multivalue=False, required=False)
-option: Bool('ipamigrationenabled', attribute=True, autofill=False, cli_name='enable_migration', label=Gettext('Migration mode', domain='ipa', localedir=None), multivalue=False, required=False)
+option: Bool('ipamigrationenabled', attribute=True, autofill=False, cli_name='enable_migration', label=Gettext('Enable migration mode', domain='ipa', localedir=None), multivalue=False, required=False)
option: List('ipagroupobjectclasses', attribute=True, autofill=False, cli_name='groupobjectclasses', label=Gettext('Default group objectclasses', domain='ipa', localedir=None), multivalue=True, required=False)
option: List('ipauserobjectclasses', attribute=True, autofill=False, cli_name='userobjectclasses', label=Gettext('Default user objectclasses', domain='ipa', localedir=None), multivalue=True, required=False)
option: Int('ipapwdexpadvnotify', attribute=True, autofill=False, cli_name='pwdexpnotify', label=Gettext('Password Expiration Notification', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
diff --git a/install/ui/serverconfig.js b/install/ui/serverconfig.js
index 5707d5d..9779dcc 100644
--- a/install/ui/serverconfig.js
+++ b/install/ui/serverconfig.js
@@ -48,12 +48,19 @@ IPA.entity_factories.config = function(){
fields:[
'ipausersearchfields',
'ipadefaultemaildomain',
- 'ipadefaultprimarygroup',
+ {
+ factory:IPA.entity_select_widget,
+ name: 'ipadefaultprimarygroup',
+ entity: 'group'
+ },
'ipahomesrootdir',
'ipamaxusernamelength',
- 'ipamigrationenabled',
'ipapwdexpadvnotify',
{
+ factory: IPA.checkbox_widget,
+ name: 'ipamigrationenabled'
+ },
+ {
factory: IPA.multivalued_text_widget,
name: 'ipauserobjectclasses'
}
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 0dd7758..c3b47ea 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -8552,7 +8552,7 @@
"flags": [],
"hint": null,
"include": null,
- "label": "Migration mode",
+ "label": "Enable migration mode",
"multivalue": false,
"name": "ipamigrationenabled",
"primary_key": false,
@@ -15878,34 +15878,37 @@
"Administrator"
],
"gidnumber": [
- "85800000"
+ "1965600000"
],
"homedirectory": [
"/home/admin"
],
"ipauniqueid": [
- "f91142a2-a19b-11e0-843c-525400b55a47"
+ "9e262c00-a357-11e0-a074-525400b55a47"
],
"krbextradata": [
{
- "__base64__": "AAKl9AlOcm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
+ "__base64__": "AAgBAA=="
},
{
- "__base64__": "AAgBAA=="
+ "__base64__": "AAL33AxOcm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
}
],
"krblastpwdchange": [
- "20110628153501Z"
+ "20110630203047Z"
],
"krblastsuccessfulauth": [
- "20110630175326Z"
+ "20110701022251Z"
],
"krbpasswordexpiration": [
- "20110926153501Z"
+ "20110928203047Z"
],
"krbprincipalname": [
"admin@SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM"
],
+ "krbpwdpolicyreference": [
+ "cn=admins,cn=SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
+ ],
"loginshell": [
"/bin/bash"
],
@@ -15931,7 +15934,7 @@
"admin"
],
"uidnumber": [
- "85800000"
+ "1965600000"
]
}
],
@@ -16021,4 +16024,4 @@
}
]
}
-} \ No newline at end of file
+}
diff --git a/install/ui/widget.js b/install/ui/widget.js
index c2b1377..a56e552 100644
--- a/install/ui/widget.js
+++ b/install/ui/widget.js
@@ -790,6 +790,13 @@ IPA.checkbox_widget = function (spec) {
that.update = function() {
var value = that.values && that.values.length ? that.values[0] : false;
+ if (value ==="FALSE"){
+ value = false;
+ }
+ if (value ==="TRUE"){
+ value = true;
+ }
+
$('input[name="'+that.name+'"]', that.container).get(0).checked = value;
};
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index 5e5baad..d05e4f4 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -141,7 +141,7 @@ class config(LDAPObject):
),
Bool('ipamigrationenabled?',
cli_name='enable_migration',
- label=_('Migration mode'),
+ label=_('Enable migration mode'),
doc=_('Enable migration mode.'),
),
Str('ipacertificatesubjectbase?',