diff options
author | Endi S. Dewata <edewata@redhat.com> | 2011-07-13 21:10:47 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-07-14 11:44:48 -0400 |
commit | 4bd85ceb90d6b8639c14e68691f2c9f447980c2d (patch) | |
tree | 0d114ff0faea534d6f3e2b81e35d25196ef5f2e7 | |
parent | a746c613a4fb3d0eed5c73455ebb2e674ed7793d (diff) | |
download | freeipa-4bd85ceb90d6b8639c14e68691f2c9f447980c2d.tar.gz freeipa-4bd85ceb90d6b8639c14e68691f2c9f447980c2d.tar.xz freeipa-4bd85ceb90d6b8639c14e68691f2c9f447980c2d.zip |
Fixed label capitalization
The CSS text-transform sometimes produces incorrect capitalization,
so the code has been modified to use translated labels that already
contain the correct capitalization.
Ticket #1424
33 files changed, 333 insertions, 87 deletions
diff --git a/install/ui/association.js b/install/ui/association.js index b78e1e36b..32b4c3697 100644 --- a/install/ui/association.js +++ b/install/ui/association.js @@ -507,7 +507,7 @@ IPA.association_table_widget = function (spec) { var label = IPA.metadata.objects[that.other_entity].label; var title = IPA.messages.association.add; - title = title.replace('${entity}', that.entity_name); + title = title.replace('${entity}', IPA.metadata.objects[that.entity_name].label_singular); title = title.replace('${primary_key}', pkey); title = title.replace('${other_entity}', label); @@ -571,7 +571,6 @@ IPA.association_table_widget = function (spec) { if (!selected_values.length) { var message = IPA.messages.dialogs.remove_empty; - message = message.replace('${entity}', that.label); alert(message); return; } @@ -580,7 +579,7 @@ IPA.association_table_widget = function (spec) { var label = IPA.metadata.objects[that.other_entity].label; var title = IPA.messages.association.remove; - title = title.replace('${entity}', that.entity_name); + title = title.replace('${entity}', IPA.metadata.objects[that.entity_name].label_singular); title = title.replace('${primary_key}', pkey); title = title.replace('${other_entity}', label); @@ -896,7 +895,7 @@ IPA.association_facet = function (spec) { var label = IPA.metadata.objects[that.other_entity] ? IPA.metadata.objects[that.other_entity].label : that.other_entity; var title = IPA.messages.association.add; - title = title.replace('${entity}', that.entity_name); + title = title.replace('${entity}', IPA.metadata.objects[that.entity_name].label_singular); title = title.replace('${primary_key}', pkey); title = title.replace('${other_entity}', label); @@ -948,7 +947,6 @@ IPA.association_facet = function (spec) { if (!values.length) { var message = IPA.messages.dialogs.remove_empty; - message = message.replace('${entity}', label); alert(message); return; } @@ -956,7 +954,7 @@ IPA.association_facet = function (spec) { var pkey = IPA.nav.get_state(that.entity_name+'-pkey'); var title = IPA.messages.association.remove; - title = title.replace('${entity}', that.entity_name); + title = title.replace('${entity}', IPA.metadata.objects[that.entity_name].label_singular); title = title.replace('${primary_key}', pkey); title = title.replace('${other_entity}', label); diff --git a/install/ui/hbac.js b/install/ui/hbac.js index 022e26a0d..87f8a36dc 100644 --- a/install/ui/hbac.js +++ b/install/ui/hbac.js @@ -845,7 +845,7 @@ IPA.hbacrule_accesstime_widget = function(spec) { var pkey = IPA.nav.get_state(that.entity_name+'-pkey'); var title = IPA.messages.association.add; - title = title.replace('${entity}', IPA.metadata.objects[that.entity_name].label); + title = title.replace('${entity}', IPA.metadata.objects[that.entity_name].label_singular); title = title.replace('${primary_key}', pkey); title = title.replace('${other_entity}', that.label); @@ -947,14 +947,13 @@ IPA.hbacrule_accesstime_widget = function(spec) { var title; if (!values.length) { title = IPA.messages.dialogs.remove_empty; - title = title.replace('${entity}', that.label); alert(title); return; } var pkey = IPA.nav.get_state(that.entity_name+'-pkey'); title = IPA.messages.association.remove; - title = title.replace('${entity}', IPA.metadata.objects[that.entity_name].label); + title = title.replace('${entity}', IPA.metadata.objects[that.entity_name].label_singular); title = title.replace('${primary_key}', pkey); title = title.replace('${other_entity}', that.label); diff --git a/install/ui/host.js b/install/ui/host.js index fe9eabf0b..704783eec 100644 --- a/install/ui/host.js +++ b/install/ui/host.js @@ -285,7 +285,7 @@ IPA.host_provisioning_status_widget = function (spec) { that.show_unprovision_dialog = function() { - var label = IPA.metadata.objects[that.entity_name].label; + var label = IPA.metadata.objects[that.entity_name].label_singular; var title = IPA.messages.objects.host.unprovision_title; title = title.replace('${entity}', label); @@ -378,7 +378,7 @@ IPA.host_certificate_status_widget = function (spec) { that.init = function() { - that.entity_label = IPA.metadata.objects[that.entity_name].label; + that.entity_label = IPA.metadata.objects[that.entity_name].label_singular; that.get_entity_pkey = function(result) { var values = result['fqdn']; diff --git a/install/ui/ipa.css b/install/ui/ipa.css index 9c9012ea2..a36315478 100644 --- a/install/ui/ipa.css +++ b/install/ui/ipa.css @@ -459,6 +459,7 @@ div.tabs { .facet-pkey { color:black; + text-transform: none; } .breadcrumb { @@ -948,10 +949,6 @@ a { /* ---- Dialog ---- */ -.ui-dialog .ui-dialog-title { - text-transform: capitalize; -} - .ui-dialog .ui-dialog-titlebar-close span { background-color: transparent !important; } diff --git a/install/ui/search.js b/install/ui/search.js index 91f3d0b23..29c52c879 100644 --- a/install/ui/search.js +++ b/install/ui/search.js @@ -193,7 +193,6 @@ IPA.search_facet = function(spec) { var title; if (!values.length) { title = IPA.messages.dialogs.remove_empty; - title = title.replace('${entity}', label); alert(title); return; } diff --git a/install/ui/service.js b/install/ui/service.js index 943995a22..618269c8f 100644 --- a/install/ui/service.js +++ b/install/ui/service.js @@ -266,7 +266,7 @@ IPA.service_provisioning_status_widget = function (spec) { that.unprovision = function() { - var label = IPA.metadata.objects[that.entity_name].label; + var label = IPA.metadata.objects[that.entity_name].label_singular; var title = IPA.messages.objects.service.unprovision_title; title = title.replace('${entity}', label); @@ -323,7 +323,7 @@ IPA.service_certificate_status_widget = function (spec) { that.init = function() { - that.entity_label = IPA.metadata.objects[that.entity_name].label; + that.entity_label = IPA.metadata.objects[that.entity_name].label_singular; that.get_entity_pkey = function(result) { var values = result['krbprincipalname']; diff --git a/install/ui/sudo.js b/install/ui/sudo.js index 26e1bdb00..efa5a955e 100644 --- a/install/ui/sudo.js +++ b/install/ui/sudo.js @@ -709,7 +709,6 @@ IPA.sudo.options_section = function(spec) { if (!values.length) { var message = IPA.messages.dialogs.remove_empty; - message = message.replace('${entity}', label); alert(message); return; } diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index e7a52d385..6277e39c4 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -49,6 +49,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -77,6 +78,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -141,6 +143,7 @@ "minlength": null, "multivalue": false, "name": "automountkey", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -167,6 +170,7 @@ "minlength": null, "multivalue": false, "name": "automountinformation", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -254,6 +258,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -282,6 +287,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -341,6 +347,7 @@ "minlength": null, "multivalue": false, "name": "newautomountinformation", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -405,6 +412,7 @@ "minlength": null, "multivalue": false, "name": "automountkey", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -431,6 +439,7 @@ "minlength": null, "multivalue": false, "name": "automountinformation", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -464,6 +473,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -492,6 +502,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -614,6 +625,7 @@ "minlength": null, "multivalue": false, "name": "masterfile", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -724,6 +736,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -752,6 +765,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -785,6 +799,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -813,6 +828,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -839,6 +855,7 @@ "minlength": null, "multivalue": false, "name": "key", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -865,6 +882,7 @@ "minlength": null, "multivalue": false, "name": "parentmap", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -990,6 +1008,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1018,6 +1037,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1122,6 +1142,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1150,6 +1171,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1254,6 +1276,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1282,6 +1305,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1407,6 +1431,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1435,6 +1460,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1554,6 +1580,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1582,6 +1609,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1761,6 +1789,10 @@ } ] }, + "dnsrecord_mod": { + "takes_args": [], + "takes_options": [] + }, "dnsrecord_show": { "takes_args": [], "takes_options": [ @@ -1823,6 +1855,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1851,6 +1884,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -1910,6 +1944,7 @@ "minlength": null, "multivalue": false, "name": "ip_address", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2016,6 +2051,39 @@ "query": false, "required": false, "type": "int" + }, + { + "alwaysask": false, + "attribute": false, + "autofill": true, + "class": "Flag", + "cli_name": "forward_only", + "cli_short_name": null, + "default": false, + "doc": "Search for forward zones only", + "exclude": null, + "falsehoods": [ + 0, + "0", + "false", + "FALSE" + ], + "flags": [], + "hint": null, + "include": null, + "label": "Forward zones only", + "multivalue": false, + "name": "forward_only", + "primary_key": false, + "query": false, + "required": true, + "truths": [ + "1", + 1, + "true", + "TRUE" + ], + "type": "bool" } ] }, @@ -2043,6 +2111,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2071,6 +2140,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2281,6 +2351,7 @@ "minlength": null, "multivalue": true, "name": "usercertificate", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2312,6 +2383,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2340,6 +2412,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2369,6 +2442,7 @@ "minlength": null, "multivalue": false, "name": "uuid", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2399,6 +2473,7 @@ "minlength": null, "multivalue": false, "name": "username", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2429,6 +2504,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2457,6 +2533,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2486,6 +2563,7 @@ "minlength": null, "multivalue": false, "name": "ipaentitlementid", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2512,6 +2590,7 @@ "minlength": null, "multivalue": false, "name": "password", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2576,6 +2655,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2604,6 +2684,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2803,6 +2884,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2831,6 +2913,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -2972,6 +3055,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3000,6 +3084,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3149,6 +3234,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3177,6 +3263,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3297,6 +3384,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3325,6 +3413,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3450,6 +3539,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3478,6 +3568,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3582,6 +3673,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3610,6 +3702,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3739,6 +3832,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3767,6 +3861,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -3939,6 +4034,7 @@ "minlength": null, "multivalue": false, "name": "ip_address", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4072,6 +4168,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4100,6 +4197,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4159,6 +4257,7 @@ "minlength": null, "multivalue": false, "name": "krbprincipalname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4227,6 +4326,7 @@ "minlength": null, "multivalue": false, "name": "out", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4260,6 +4360,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4288,6 +4389,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4417,6 +4519,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4445,6 +4548,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4553,6 +4657,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4581,6 +4686,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4689,6 +4795,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4717,6 +4824,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4917,6 +5025,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -4945,6 +5054,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5053,6 +5163,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5081,6 +5192,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5210,6 +5322,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5238,6 +5351,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5346,6 +5460,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5374,6 +5489,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5507,6 +5623,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5535,6 +5652,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5647,6 +5765,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5675,6 +5794,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5800,6 +5920,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5828,6 +5949,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5925,6 +6047,7 @@ "minlength": null, "multivalue": false, "name": "user", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5958,6 +6081,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -5986,6 +6110,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6119,6 +6244,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6147,6 +6273,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6412,6 +6539,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6440,6 +6568,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6541,6 +6670,7 @@ "minlength": null, "multivalue": false, "name": "out", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6574,6 +6704,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6602,6 +6733,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6727,6 +6859,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6755,6 +6888,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6859,6 +6993,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -6887,6 +7022,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7016,6 +7152,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7044,6 +7181,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7152,6 +7290,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7180,6 +7319,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7223,6 +7363,7 @@ "minlength": null, "multivalue": false, "name": "ipasudoopt", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7368,6 +7509,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7396,6 +7538,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7472,6 +7615,7 @@ "minlength": null, "multivalue": false, "name": "ipasudoopt", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7555,6 +7699,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7583,6 +7728,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7782,6 +7928,7 @@ "minlength": null, "multivalue": true, "name": "addattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7810,6 +7957,7 @@ "minlength": null, "multivalue": true, "name": "setattr", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -7919,7 +8067,7 @@ "aci" ], "label": "Automount Keys", - "label_singular": "automount key", + "label_singular": "Automount Key", "methods": [ "add", "del", @@ -7979,6 +8127,7 @@ "minlength": null, "multivalue": false, "name": "automountkey", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8005,6 +8154,7 @@ "minlength": null, "multivalue": false, "name": "automountinformation", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8038,6 +8188,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -8064,7 +8215,7 @@ "aci" ], "label": "Automount Locations", - "label_singular": "automount location", + "label_singular": "Automount Location", "methods": [ "add", "del", @@ -8125,6 +8276,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -8153,7 +8305,7 @@ "aci" ], "label": "Automount Maps", - "label_singular": "automount map", + "label_singular": "Automount Map", "methods": [ "add", "add_indirect", @@ -8214,6 +8366,7 @@ "minlength": null, "multivalue": false, "name": "automountmapname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -8240,6 +8393,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8274,7 +8428,7 @@ "aci" ], "label": "Configuration", - "label_singular": "configuration", + "label_singular": "Configuration", "methods": [ "mod", "show" @@ -8351,6 +8505,7 @@ "minlength": null, "multivalue": false, "name": "ipahomesrootdir", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8377,6 +8532,7 @@ "minlength": null, "multivalue": false, "name": "ipadefaultloginshell", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8403,6 +8559,7 @@ "minlength": null, "multivalue": false, "name": "ipadefaultprimarygroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8429,6 +8586,7 @@ "minlength": null, "multivalue": false, "name": "ipadefaultemaildomain", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8501,6 +8659,7 @@ "minlength": null, "multivalue": false, "name": "ipausersearchfields", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8527,6 +8686,7 @@ "minlength": null, "multivalue": false, "name": "ipagroupsearchfields", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8588,6 +8748,7 @@ "minlength": null, "multivalue": false, "name": "ipacertificatesubjectbase", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -8685,6 +8846,7 @@ "minlength": null, "multivalue": false, "name": "ipaconfigstring", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -9543,7 +9705,7 @@ "aci" ], "label": "Entry", - "label_singular": "entry", + "label_singular": "Entry", "methods": [ "add", "del", @@ -9606,6 +9768,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -9632,6 +9795,7 @@ "minlength": null, "multivalue": false, "name": "krbpwdpolicyreference", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -9668,7 +9832,7 @@ "delegation": { "bindable": false, "label": "Delegations", - "label_singular": "delegation", + "label_singular": "Delegation", "methods": [ "add", "del", @@ -9677,12 +9841,8 @@ "show" ], "name": "delegation", - "object_name": [ - "delegation" - ], - "object_name_plural": [ - "delegation" - ], + "object_name": "delegation", + "object_name_plural": "delegations", "primary_key": "aciname", "takes_params": [ { @@ -9704,6 +9864,7 @@ "minlength": null, "multivalue": false, "name": "aciname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -9776,6 +9937,7 @@ "minlength": null, "multivalue": false, "name": "memberof", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -9802,6 +9964,7 @@ "minlength": null, "multivalue": false, "name": "group", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -9890,13 +10053,14 @@ "aci" ], "label": "DNS Resource Records", - "label_singular": "DNS resource record", + "label_singular": "DNS Resource Record", "methods": [ "add", "add_record", "del", "delentry", "find", + "mod", "show" ], "name": "dnsrecord", @@ -9952,6 +10116,7 @@ "minlength": null, "multivalue": false, "name": "idnsname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -10108,7 +10273,7 @@ "aci" ], "label": "DNS Zones", - "label_singular": "DNS zone", + "label_singular": "DNS Zone", "methods": [ "add", "del", @@ -10172,6 +10337,7 @@ "minlength": null, "multivalue": false, "name": "idnsname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -10198,6 +10364,7 @@ "minlength": null, "multivalue": false, "name": "idnssoamname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -10224,6 +10391,7 @@ "minlength": null, "multivalue": false, "name": "idnssoarname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -10415,6 +10583,7 @@ "minlength": null, "multivalue": false, "name": "idnsupdatepolicy", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -10512,7 +10681,7 @@ "aci" ], "label": "Entitlements", - "label_singular": "entitlement", + "label_singular": "Entitlement", "methods": [ "consume", "find", @@ -10613,7 +10782,7 @@ "aci" ], "label": "User Groups", - "label_singular": "user group", + "label_singular": "User Group", "methods": [ "add", "add_member", @@ -10676,6 +10845,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": "^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$", "pattern_errmsg": "may only include letters, numbers, _, -, . and $", "primary_key": true, @@ -10702,6 +10872,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -10794,7 +10965,7 @@ "aci" ], "label": "HBAC Rules", - "label_singular": "HBAC rule", + "label_singular": "HBAC Rule", "methods": [ "add", "add_host", @@ -10865,6 +11036,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -11012,6 +11184,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11079,6 +11252,7 @@ "minlength": null, "multivalue": false, "name": "memberuser_user", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11109,6 +11283,7 @@ "minlength": null, "multivalue": false, "name": "memberuser_group", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11139,6 +11314,7 @@ "minlength": null, "multivalue": false, "name": "memberhost_host", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11169,6 +11345,7 @@ "minlength": null, "multivalue": false, "name": "memberhost_hostgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11199,6 +11376,7 @@ "minlength": null, "multivalue": false, "name": "sourcehost_host", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11229,6 +11407,7 @@ "minlength": null, "multivalue": false, "name": "sourcehost_hostgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11259,6 +11438,7 @@ "minlength": null, "multivalue": false, "name": "memberservice_hbacsvc", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11289,6 +11469,7 @@ "minlength": null, "multivalue": false, "name": "memberservice_hbacsvcgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11320,7 +11501,7 @@ "aci" ], "label": "HBAC Services", - "label_singular": "HBAC service", + "label_singular": "HBAC Service", "methods": [ "add", "del", @@ -11381,6 +11562,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -11407,6 +11589,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11447,7 +11630,7 @@ "aci" ], "label": "HBAC Service Groups", - "label_singular": "HBAC service group", + "label_singular": "HBAC Service Group", "methods": [ "add", "add_member", @@ -11510,6 +11693,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -11536,6 +11720,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11612,7 +11797,7 @@ "aci" ], "label": "Hosts", - "label_singular": "host", + "label_singular": "Host", "methods": [ "add", "add_managedby", @@ -11679,6 +11864,7 @@ "minlength": null, "multivalue": false, "name": "fqdn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -11705,6 +11891,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11731,6 +11918,7 @@ "minlength": null, "multivalue": false, "name": "l", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11757,6 +11945,7 @@ "minlength": null, "multivalue": false, "name": "nshostlocation", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11783,6 +11972,7 @@ "minlength": null, "multivalue": false, "name": "nshardwareplatform", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11809,6 +11999,7 @@ "minlength": null, "multivalue": false, "name": "nsosversion", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11835,6 +12026,7 @@ "minlength": null, "multivalue": false, "name": "userpassword", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11900,6 +12092,7 @@ "minlength": null, "multivalue": false, "name": "randompassword", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -11956,6 +12149,7 @@ "minlength": null, "multivalue": false, "name": "krbprincipalname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12015,7 +12209,7 @@ "aci" ], "label": "Host Groups", - "label_singular": "host group", + "label_singular": "Host Group", "methods": [ "add", "add_member", @@ -12078,6 +12272,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -12104,6 +12299,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12128,7 +12324,7 @@ "aci" ], "label": "Kerberos Ticket Policy", - "label_singular": "Kerberos ticket policy", + "label_singular": "Kerberos Ticket Policy", "methods": [ "mod", "reset", @@ -12184,6 +12380,7 @@ "minlength": null, "multivalue": false, "name": "uid", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -12294,7 +12491,7 @@ "aci" ], "label": "Netgroups", - "label_singular": "netgroup", + "label_singular": "Netgroup", "methods": [ "add", "add_member", @@ -12363,6 +12560,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -12389,6 +12587,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12415,6 +12614,7 @@ "minlength": null, "multivalue": false, "name": "nisdomainname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12444,6 +12644,7 @@ "minlength": null, "multivalue": false, "name": "ipauniqueid", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12534,7 +12735,7 @@ "aci" ], "label": "Permissions", - "label_singular": "permission", + "label_singular": "Permission", "methods": [ "add", "add_member", @@ -12597,6 +12798,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -12708,6 +12910,7 @@ "minlength": null, "multivalue": false, "name": "memberof", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12737,6 +12940,7 @@ "minlength": null, "multivalue": false, "name": "filter", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12766,6 +12970,7 @@ "minlength": null, "multivalue": false, "name": "subtree", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12795,6 +13000,7 @@ "minlength": null, "multivalue": false, "name": "targetgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12847,7 +13053,7 @@ "aci" ], "label": "Privileges", - "label_singular": "privilege", + "label_singular": "Privilege", "methods": [ "add", "add_member", @@ -12912,6 +13118,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -12938,6 +13145,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -12981,7 +13189,7 @@ "aci" ], "label": "Password Policies", - "label_singular": "password policy", + "label_singular": "Password Policy", "methods": [ "add", "del", @@ -13043,6 +13251,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -13299,7 +13508,7 @@ "aci" ], "label": "Roles", - "label_singular": "role", + "label_singular": "Role", "methods": [ "add", "add_member", @@ -13364,6 +13573,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -13390,6 +13600,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -13403,7 +13614,7 @@ "selfservice": { "bindable": false, "label": "Self Service Permissions", - "label_singular": "self service permission", + "label_singular": "Self Service Permission", "methods": [ "add", "del", @@ -13412,12 +13623,8 @@ "show" ], "name": "selfservice", - "object_name": [ - "self service permission" - ], - "object_name_plural": [ - "self service permissions" - ], + "object_name": "self service permission", + "object_name_plural": "self service permissions", "primary_key": "aciname", "takes_params": [ { @@ -13439,6 +13646,7 @@ "minlength": null, "multivalue": false, "name": "aciname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -13541,7 +13749,7 @@ "aci" ], "label": "Services", - "label_singular": "service", + "label_singular": "Service", "methods": [ "add", "add_host", @@ -13594,6 +13802,7 @@ "minlength": null, "multivalue": false, "name": "krbprincipalname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -13657,7 +13866,7 @@ "aci" ], "label": "Sudo Commands", - "label_singular": "sudo command", + "label_singular": "Sudo Command", "methods": [ "add", "del", @@ -13718,6 +13927,7 @@ "minlength": null, "multivalue": false, "name": "sudocmd", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -13744,6 +13954,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -13784,7 +13995,7 @@ "aci" ], "label": "Sudo Command Groups", - "label_singular": "sudo command group", + "label_singular": "Sudo Command Group", "methods": [ "add", "add_member", @@ -13847,6 +14058,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -13873,6 +14085,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -13903,6 +14116,7 @@ "minlength": null, "multivalue": false, "name": "membercmd_sudocmd", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -13933,6 +14147,7 @@ "minlength": null, "multivalue": false, "name": "membercmd_sudocmdgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14012,7 +14227,7 @@ "aci" ], "label": "Sudo Rules", - "label_singular": "sudo rule", + "label_singular": "Sudo Rule", "methods": [ "add", "add_allow_command", @@ -14089,6 +14304,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": true, @@ -14115,6 +14331,7 @@ "minlength": null, "multivalue": false, "name": "description", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14302,6 +14519,7 @@ "minlength": null, "multivalue": false, "name": "memberuser_user", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14332,6 +14550,7 @@ "minlength": null, "multivalue": false, "name": "memberuser_group", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14362,6 +14581,7 @@ "minlength": null, "multivalue": false, "name": "memberhost_host", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14392,6 +14612,7 @@ "minlength": null, "multivalue": false, "name": "memberhost_hostgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14422,6 +14643,7 @@ "minlength": null, "multivalue": false, "name": "memberallowcmd_sudocmd", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14452,6 +14674,7 @@ "minlength": null, "multivalue": false, "name": "memberdenycmd_sudocmd", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14482,6 +14705,7 @@ "minlength": null, "multivalue": false, "name": "memberallowcmd_sudocmdgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14512,6 +14736,7 @@ "minlength": null, "multivalue": false, "name": "memberdenycmd_sudocmdgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14542,6 +14767,7 @@ "minlength": null, "multivalue": false, "name": "ipasudorunas_user", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14572,6 +14798,7 @@ "minlength": null, "multivalue": false, "name": "ipasudorunas_group", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14598,6 +14825,7 @@ "minlength": null, "multivalue": false, "name": "externaluser", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14624,6 +14852,7 @@ "minlength": null, "multivalue": false, "name": "ipasudorunasextuser", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14650,6 +14879,7 @@ "minlength": null, "multivalue": false, "name": "ipasudorunasextgroup", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14783,7 +15013,7 @@ "aci" ], "label": "Users", - "label_singular": "user", + "label_singular": "User", "methods": [ "add", "del", @@ -14846,6 +15076,7 @@ "minlength": null, "multivalue": false, "name": "uid", + "noextrawhitespace": true, "pattern": "^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$", "pattern_errmsg": "may only include letters, numbers, _, -, . and $", "primary_key": true, @@ -14872,6 +15103,7 @@ "minlength": null, "multivalue": false, "name": "givenname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14898,6 +15130,7 @@ "minlength": null, "multivalue": false, "name": "sn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14924,6 +15157,7 @@ "minlength": null, "multivalue": false, "name": "cn", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14950,6 +15184,7 @@ "minlength": null, "multivalue": false, "name": "displayname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -14976,6 +15211,7 @@ "minlength": null, "multivalue": false, "name": "initials", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15002,6 +15238,7 @@ "minlength": null, "multivalue": false, "name": "homedirectory", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15028,6 +15265,7 @@ "minlength": null, "multivalue": false, "name": "gecos", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15054,6 +15292,7 @@ "minlength": null, "multivalue": false, "name": "loginshell", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15082,6 +15321,7 @@ "minlength": null, "multivalue": false, "name": "krbprincipalname", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15108,6 +15348,7 @@ "minlength": null, "multivalue": true, "name": "mail", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15136,6 +15377,7 @@ "minlength": null, "multivalue": false, "name": "userpassword", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15208,6 +15450,7 @@ "minlength": null, "multivalue": false, "name": "street", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15234,6 +15477,7 @@ "minlength": null, "multivalue": false, "name": "l", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15260,6 +15504,7 @@ "minlength": null, "multivalue": false, "name": "st", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15286,6 +15531,7 @@ "minlength": null, "multivalue": false, "name": "postalcode", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15312,6 +15558,7 @@ "minlength": null, "multivalue": true, "name": "telephonenumber", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15338,6 +15585,7 @@ "minlength": null, "multivalue": true, "name": "mobile", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15364,6 +15612,7 @@ "minlength": null, "multivalue": true, "name": "pager", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15390,6 +15639,7 @@ "minlength": null, "multivalue": true, "name": "facsimiletelephonenumber", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15416,6 +15666,7 @@ "minlength": null, "multivalue": false, "name": "ou", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15442,6 +15693,7 @@ "minlength": null, "multivalue": false, "name": "title", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15468,6 +15720,7 @@ "minlength": null, "multivalue": false, "name": "manager", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15494,6 +15747,7 @@ "minlength": null, "multivalue": false, "name": "carlicense", + "noextrawhitespace": true, "pattern": null, "pattern_errmsg": null, "primary_key": false, @@ -15595,7 +15849,7 @@ "dirty_title": "Dirty", "hide_already_enrolled": "Hide already enrolled.", "prospective": "Prospective", - "remove_empty": "Select ${entity} to be removed.", + "remove_empty": "Select entries to be removed.", "remove_title": "Remove ${entity}" }, "facet_groups": { diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index dcfa03559..ce30be7ec 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -188,7 +188,7 @@ class automountlocation(LDAPObject): object_class = ['nscontainer'] default_attributes = ['cn'] label = _('Automount Locations') - label_singular = _('automount location') + label_singular = _('Automount Location') takes_params = ( Str('cn', @@ -513,7 +513,7 @@ class automountmap(LDAPObject): ) label = _('Automount Maps') - label_singular = _('automount map') + label_singular = _('Automount Map') api.register(automountmap) @@ -605,7 +605,7 @@ class automountkey(LDAPObject): num_parents = 2 label = _('Automount Keys') - label_singular = _('automount key') + label_singular = _('Automount Key') already_exists_msg = _('The key,info pair must be unique. A key named %(key)s with info %(info)s already exists') key_already_exists_msg = _('key named %(key)s already exists') object_not_found_msg = _('The automount key %(key)s with info %(info)s does not exist') diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 87a9fbed3..8d58422bd 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -280,7 +280,7 @@ class LDAPObject(Object): ), } label = _('Entry') - label_singular = _('entry') + label_singular = _('Entry') container_not_found_msg = _('container entry (%(container)s) not found') parent_not_found_msg = _('%(parent)s: %(oname)s not found') diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py index 82b8e8994..b973e43bc 100644 --- a/ipalib/plugins/config.py +++ b/ipalib/plugins/config.py @@ -90,7 +90,7 @@ class config(LDAPObject): ] label = _('Configuration') - label_singular = _('configuration') + label_singular = _('Configuration') takes_params = ( Int('ipamaxusernamelength?', diff --git a/ipalib/plugins/delegation.py b/ipalib/plugins/delegation.py index 0327b1dab..bb0431e88 100644 --- a/ipalib/plugins/delegation.py +++ b/ipalib/plugins/delegation.py @@ -100,7 +100,7 @@ class delegation(Object): object_name = _('delegation') object_name_plural = _('delegations') label = _('Delegations') - label_singular = _('delegation') + label_singular = _('Delegation') takes_params = ( Str('aciname', diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index e7a0a05a3..2928a9000 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -286,7 +286,7 @@ class dnszone(LDAPObject): 'idnssoaminimum' ] + _record_attributes label = _('DNS Zones') - label_singular = _('DNS zone') + label_singular = _('DNS Zone') takes_params = ( Str('idnsname', @@ -544,7 +544,7 @@ class dnsrecord(LDAPObject): default_attributes = _record_attributes + ['idnsname'] label = _('DNS Resource Records') - label_singular = _('DNS resource record') + label_singular = _('DNS Resource Record') takes_params = ( Str('idnsname', diff --git a/ipalib/plugins/entitle.py b/ipalib/plugins/entitle.py index 03b6f02f0..74ee874b7 100644 --- a/ipalib/plugins/entitle.py +++ b/ipalib/plugins/entitle.py @@ -187,7 +187,7 @@ class entitle(LDAPObject): uuid_attribute = 'ipaentitlementid' label = _('Entitlements') - label_singular = _('entitlement') + label_singular = _('Entitlement') """ def get_dn(self, *keys, **kwargs): diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py index 819d8c832..3298b2bd3 100644 --- a/ipalib/plugins/group.py +++ b/ipalib/plugins/group.py @@ -98,7 +98,7 @@ class group(LDAPObject): rdnattr = 'cn' label = _('User Groups') - label_singular = _('user group') + label_singular = _('User Group') takes_params = ( Str('cn', diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py index b4398b85b..2488b1d91 100644 --- a/ipalib/plugins/hbacrule.py +++ b/ipalib/plugins/hbacrule.py @@ -124,7 +124,7 @@ class hbacrule(LDAPObject): } label = _('HBAC Rules') - label_singular = _('HBAC rule') + label_singular = _('HBAC Rule') takes_params = ( Str('cn', diff --git a/ipalib/plugins/hbacsvc.py b/ipalib/plugins/hbacsvc.py index 552bd1acf..7ba1bf6bd 100644 --- a/ipalib/plugins/hbacsvc.py +++ b/ipalib/plugins/hbacsvc.py @@ -59,7 +59,7 @@ class hbacsvc(LDAPObject): uuid_attribute = 'ipauniqueid' label = _('HBAC Services') - label_singular = _('HBAC service') + label_singular = _('HBAC Service') takes_params = ( Str('cn', diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py index 609958343..12db5f341 100644 --- a/ipalib/plugins/hbacsvcgroup.py +++ b/ipalib/plugins/hbacsvcgroup.py @@ -62,7 +62,7 @@ class hbacsvcgroup(LDAPObject): } label = _('HBAC Service Groups') - label_singular = _('HBAC service group') + label_singular = _('HBAC Service Group') takes_params = ( Str('cn', diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py index 37d906d48..5cd1056ec 100644 --- a/ipalib/plugins/host.py +++ b/ipalib/plugins/host.py @@ -244,7 +244,7 @@ class host(LDAPObject): } label = _('Hosts') - label_singular = _('host') + label_singular = _('Host') takes_params = ( Str('fqdn', validate_host, diff --git a/ipalib/plugins/hostgroup.py b/ipalib/plugins/hostgroup.py index 5b231316a..11ed66376 100644 --- a/ipalib/plugins/hostgroup.py +++ b/ipalib/plugins/hostgroup.py @@ -71,7 +71,7 @@ class hostgroup(LDAPObject): } label = _('Host Groups') - label_singular = _('host group') + label_singular = _('Host Group') takes_params = ( Str('cn', diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index e580df8e4..6f279834a 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -348,7 +348,7 @@ class i18n_messages(Command): "dirty_message":_("This page has unsaved changes. Please save or revert."), "dirty_title":_("Dirty"), "hide_already_enrolled":_("Hide already enrolled."), - "remove_empty":_("Select ${entity} to be removed."), + "remove_empty":_("Select entries to be removed."), "remove_title":_("Remove ${entity}"), "prospective":_("Prospective"), }, diff --git a/ipalib/plugins/krbtpolicy.py b/ipalib/plugins/krbtpolicy.py index e24b5447e..f16353d06 100644 --- a/ipalib/plugins/krbtpolicy.py +++ b/ipalib/plugins/krbtpolicy.py @@ -77,7 +77,7 @@ class krbtpolicy(LDAPObject): limit_object_classes = ['krbticketpolicyaux'] label=_('Kerberos Ticket Policy') - label_singular = _('Kerberos ticket policy') + label_singular = _('Kerberos Ticket Policy') takes_params = ( Str('uid?', diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py index 65949a822..b0c3b652a 100644 --- a/ipalib/plugins/netgroup.py +++ b/ipalib/plugins/netgroup.py @@ -96,7 +96,7 @@ class netgroup(LDAPObject): } label = _('Netgroups') - label_singular = _('netgroup') + label_singular = _('Netgroup') takes_params = ( Str('cn', diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py index 4f37790df..75adc9174 100644 --- a/ipalib/plugins/permission.py +++ b/ipalib/plugins/permission.py @@ -105,7 +105,7 @@ class permission(LDAPObject): rdnattr='cn' label = _('Permissions') - label_singular = _('permission') + label_singular = _('Permission') takes_params = ( Str('cn', diff --git a/ipalib/plugins/privilege.py b/ipalib/plugins/privilege.py index d1a63ace5..6365ab9b6 100644 --- a/ipalib/plugins/privilege.py +++ b/ipalib/plugins/privilege.py @@ -63,7 +63,7 @@ class privilege(LDAPObject): rdnattr='cn' label = _('Privileges') - label_singular = _('privilege') + label_singular = _('Privilege') takes_params = ( Str('cn', diff --git a/ipalib/plugins/pwpolicy.py b/ipalib/plugins/pwpolicy.py index 673f2ebf1..b2a9436fe 100644 --- a/ipalib/plugins/pwpolicy.py +++ b/ipalib/plugins/pwpolicy.py @@ -217,7 +217,7 @@ class pwpolicy(LDAPObject): ) label = _('Password Policies') - label_singular = _('password policy') + label_singular = _('Password Policy') takes_params = ( Str('cn?', diff --git a/ipalib/plugins/role.py b/ipalib/plugins/role.py index 365ee8372..c7e2f16c9 100644 --- a/ipalib/plugins/role.py +++ b/ipalib/plugins/role.py @@ -79,7 +79,7 @@ class role(LDAPObject): rdnattr='cn' label = _('Roles') - label_singular = _('role') + label_singular = _('Role') takes_params = ( Str('cn', diff --git a/ipalib/plugins/selfservice.py b/ipalib/plugins/selfservice.py index 47650e039..61530987c 100644 --- a/ipalib/plugins/selfservice.py +++ b/ipalib/plugins/selfservice.py @@ -73,7 +73,7 @@ class selfservice(Object): object_name = _('self service permission') object_name_plural = _('self service permissions') label = _('Self Service Permissions') - label_singular = _('self service permission') + label_singular = _('Self Service Permission') takes_params = ( Str('aciname', diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index 2fda56942..11970f401 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -218,7 +218,7 @@ class service(LDAPObject): } label = _('Services') - label_singular = _('service') + label_singular = _('Service') takes_params = ( Str('krbprincipalname', validate_principal, diff --git a/ipalib/plugins/sudocmd.py b/ipalib/plugins/sudocmd.py index 2da041e0a..da78f0ec5 100644 --- a/ipalib/plugins/sudocmd.py +++ b/ipalib/plugins/sudocmd.py @@ -62,7 +62,7 @@ class sudocmd(LDAPObject): } uuid_attribute = 'ipauniqueid' label = _('Sudo Commands') - label_singular = _('sudo command') + label_singular = _('Sudo Command') takes_params = ( Str('sudocmd', diff --git a/ipalib/plugins/sudocmdgroup.py b/ipalib/plugins/sudocmdgroup.py index fe7d670c8..e613f4657 100644 --- a/ipalib/plugins/sudocmdgroup.py +++ b/ipalib/plugins/sudocmdgroup.py @@ -63,7 +63,7 @@ class sudocmdgroup(LDAPObject): } label = _('Sudo Command Groups') - label_singular = _('sudo command group') + label_singular = _('Sudo Command Group') takes_params = ( Str('cn', diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py index c1bbfb62c..a1d05a815 100644 --- a/ipalib/plugins/sudorule.py +++ b/ipalib/plugins/sudorule.py @@ -66,7 +66,7 @@ class sudorule(LDAPObject): } label = _('Sudo Rules') - label_singular = _('sudo rule') + label_singular = _('Sudo Rule') takes_params = ( Str('cn', diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index f0ee8f5b8..e6060c0f3 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -114,8 +114,8 @@ class user(LDAPObject): rdnattr = 'uid' bindable = True - label_singular = _('user') label = _('Users') + label_singular = _('User') takes_params = ( Str('uid', |