From 14c2126baf538238f671541967a9ff1a39cca6b2 Mon Sep 17 00:00:00 2001
From: Adam Young <[email protected]>
Date: Tue, 5 Jul 2011 14:55:03 -0400
Subject: [PATCH] password expiration label
---
API.txt | 2 +-
install/ui/test/data/ipa_init.json | 36 +++++++++++++++---------------------
ipalib/plugins/config.py | 2 +-
3 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/API.txt b/API.txt
index 5f423302e15386fbc4dbd2f5616eda005aa3411d..c6ad1c5139c23ff0399a816b9aaeb4665fe0562f 100644
--- a/API.txt
+++ b/API.txt
@@ -340,7 +340,7 @@ option: IA5Str('ipagroupsearchfields', attribute=True, autofill=False, cli_name=
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)
+option: Int('ipapwdexpadvnotify', attribute=True, autofill=False, cli_name='pwdexpnotify', label=Gettext('Password Expiration Notification (days)', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index a7af638418efb42a6cfdb32c6182b8fb1b19d42c..7f145e3feaed0ab202391d8964c14235a97c768f 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -8653,7 +8653,7 @@
"flags": [],
"hint": null,
"include": null,
- "label": "Password Expiration Notification",
+ "label": "Password Expiration Notification (days)",
"maxvalue": 2147483647,
"minvalue": 0,
"multivalue": false,
@@ -10579,9 +10579,7 @@
],
"memberindirect": [
"user",
- "group",
- "netgroup",
- "role"
+ "group"
],
"memberof": [
"group",
@@ -11996,7 +11994,6 @@
"sudorule"
],
"memberofindirect": [
- "host",
"hostgroup",
"hbacrule",
"sudorule"
@@ -15815,10 +15812,10 @@
},
"user": {
"account": "Account Settings",
- "account_status": "Account status",
+ "account_status": "Account Status",
"activate": "Activate",
- "activation_link": "Click to ${action}",
"activation_confirmation": "Are you sure you want to ${action} the user?<br/>The change will take effect immediately.",
+ "activation_link": "Click to ${action}",
"active": "Active",
"contact": "Contact Settings",
"deactivate": "Deactivate",
@@ -15880,37 +15877,34 @@
"Administrator"
],
"gidnumber": [
- "1965600000"
+ "193200000"
],
"homedirectory": [
"/home/admin"
],
"ipauniqueid": [
- "9e262c00-a357-11e0-a074-525400b55a47"
+ "c300021e-a445-11e0-80b9-525400b55a47"
],
"krbextradata": [
{
+ "__base64__": "AAL2bA5Ocm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
+ },
+ {
"__base64__": "AAgBAA=="
- },
- {
- "__base64__": "AAL33AxOcm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
}
],
"krblastpwdchange": [
- "20110630203047Z"
+ "20110702005726Z"
],
"krblastsuccessfulauth": [
- "20110701022251Z"
+ "20110705172822Z"
],
"krbpasswordexpiration": [
- "20110928203047Z"
+ "20110930005726Z"
],
"krbprincipalname": [
"[email protected]"
],
- "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"
],
@@ -15936,7 +15930,7 @@
"admin"
],
"uidnumber": [
- "1965600000"
+ "193200000"
]
}
],
@@ -16003,7 +15997,7 @@
"mount_jsonserver": "json",
"mount_xmlserver": "xml",
"prompt_all": false,
- "ra_plugin": "selfsign",
+ "ra_plugin": "dogtag",
"realm": "SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM",
"rpc_json_uri": "http://localhost:8888/ipa/json";,
"script": "/var/www/mod_wsgi",
@@ -16026,4 +16020,4 @@
}
]
}
-}
+}
\ No newline at end of file
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index d05e4f4c6ef538d4d7b010000fe192a389a4cf19..d0a661483c48a493421906a138d0827db35c9b9a 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -162,7 +162,7 @@ class config(LDAPObject):
),
Int('ipapwdexpadvnotify?',
cli_name='pwdexpnotify',
- label=_('Password Expiration Notification'),
+ label=_('Password Expiration Notification (days)'),
doc=_('Number of days\'s notice of impending password expiration.'),
minvalue=0,
),
--
1.7.5.2
_______________________________________________
Freeipa-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/freeipa-devel
