diff options
Diffstat (limited to 'ipa-server/ipa-gui/ipagui')
20 files changed, 26 insertions, 13 deletions
diff --git a/ipa-server/ipa-gui/ipagui/Makefile.am b/ipa-server/ipa-gui/ipagui/Makefile.am index 683235678..83636323d 100644 --- a/ipa-server/ipa-gui/ipagui/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/Makefile.am @@ -26,4 +26,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/config/Makefile.am b/ipa-server/ipa-gui/ipagui/config/Makefile.am index 5d5492841..db96758f3 100644 --- a/ipa-server/ipa-gui/ipagui/config/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/config/Makefile.am @@ -16,4 +16,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/forms/Makefile.am b/ipa-server/ipa-gui/ipagui/forms/Makefile.am index c075b9f47..4f1f72d22 100644 --- a/ipa-server/ipa-gui/ipagui/forms/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/forms/Makefile.am @@ -14,4 +14,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/forms/delegate.py b/ipa-server/ipa-gui/ipagui/forms/delegate.py index 419df4fc7..d9d5d727c 100644 --- a/ipa-server/ipa-gui/ipagui/forms/delegate.py +++ b/ipa-server/ipa-gui/ipagui/forms/delegate.py @@ -43,7 +43,7 @@ aci_checkbox_attrs = [(field.name, field.label) for field in aci_attrs] aci_name_to_label = dict(aci_checkbox_attrs) -class DelegateFields(): +class DelegateFields(object): name = widgets.TextField(name="name", label="Delegation Name") source_group_dn = widgets.HiddenField(name="source_group_dn") diff --git a/ipa-server/ipa-gui/ipagui/forms/group.py b/ipa-server/ipa-gui/ipagui/forms/group.py index b67156641..fa3a0988a 100644 --- a/ipa-server/ipa-gui/ipagui/forms/group.py +++ b/ipa-server/ipa-gui/ipagui/forms/group.py @@ -2,7 +2,7 @@ import turbogears from turbogears import validators, widgets from tg_expanding_form_widget.tg_expanding_form_widget import ExpandingForm -class GroupFields(): +class GroupFields(object): cn = widgets.TextField(name="cn", label="Name") gidnumber = widgets.TextField(name="gidnumber", label="GID") description = widgets.TextField(name="description", label="Description") diff --git a/ipa-server/ipa-gui/ipagui/forms/ipapolicy.py b/ipa-server/ipa-gui/ipagui/forms/ipapolicy.py index ec0e8c6f8..78acac664 100644 --- a/ipa-server/ipa-gui/ipagui/forms/ipapolicy.py +++ b/ipa-server/ipa-gui/ipagui/forms/ipapolicy.py @@ -1,9 +1,9 @@ import turbogears from turbogears import validators, widgets -class IPAPolicyFields(): +class IPAPolicyFields(object): # From cn=ipaConfig - ipausersearchfields = widgets.TextField(name="ipausersearchfields", label="User Search Fields") + ipausersearchfields = widgets.TextField(name="ipausersearchfields", label="User Search Fields", attrs=dict(size=50)) ipagroupsearchfields = widgets.TextField(name="ipagroupsearchfields", label="Group Search Fields") ipasearchtimelimit = widgets.TextField(name="ipasearchtimelimit", label="Search Time Limit (sec.)", attrs=dict(size=6,maxlength=6)) ipasearchrecordslimit = widgets.TextField(name="ipasearchrecordslimit", label="Search Records Limit", attrs=dict(size=6,maxlength=6)) @@ -16,8 +16,8 @@ class IPAPolicyFields(): ipapolicy_orig = widgets.HiddenField(name="ipapolicy_orig") # From cn=accounts - krbmaxpwdlife = widgets.TextField(name="krbmaxpwdlife", label="Max. Password Lifetime", attrs=dict(size=3,maxlength=3)) - krbminpwdlife = widgets.TextField(name="krbminpwdlife", label="Min. Password Lifetime", attrs=dict(size=3,maxlength=3)) + krbmaxpwdlife = widgets.TextField(name="krbmaxpwdlife", label="Max. Password Lifetime (days)", attrs=dict(size=3,maxlength=3)) + krbminpwdlife = widgets.TextField(name="krbminpwdlife", label="Min. Password Lifetime (hours)", attrs=dict(size=3,maxlength=3)) krbpwdmindiffchars = widgets.TextField(name="krbpwdmindiffchars", label="Min. number of character classes", attrs=dict(size=3,maxlength=3)) krbpwdminlength = widgets.TextField(name="krbpwdminlength", label="Min. Length of password", attrs=dict(size=3,maxlength=3)) krbpwdhistorylength = widgets.TextField(name="krbpwdhistorylength", label="Password History size", attrs=dict(size=3,maxlength=3)) diff --git a/ipa-server/ipa-gui/ipagui/forms/user.py b/ipa-server/ipa-gui/ipagui/forms/user.py index 7d3d37193..f1bf48365 100644 --- a/ipa-server/ipa-gui/ipagui/forms/user.py +++ b/ipa-server/ipa-gui/ipagui/forms/user.py @@ -2,7 +2,7 @@ import turbogears from turbogears import validators, widgets from tg_expanding_form_widget.tg_expanding_form_widget import ExpandingForm -class UserFields(): +class UserFields(object): givenname = widgets.TextField(name="givenname", label="Given Name") sn = widgets.TextField(name="sn", label="Family Name") cn = widgets.TextField(name="cn", label="Common Names") diff --git a/ipa-server/ipa-gui/ipagui/helpers/Makefile.am b/ipa-server/ipa-gui/ipagui/helpers/Makefile.am index 490c8e4f1..aa3e75bf0 100644 --- a/ipa-server/ipa-gui/ipagui/helpers/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/helpers/Makefile.am @@ -12,4 +12,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/static/Makefile.am b/ipa-server/ipa-gui/ipagui/static/Makefile.am index 11c213841..d4ca45572 100644 --- a/ipa-server/ipa-gui/ipagui/static/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/static/Makefile.am @@ -8,4 +8,5 @@ SUBDIRS = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/static/css/Makefile.am b/ipa-server/ipa-gui/ipagui/static/css/Makefile.am index 482893466..fe8a39791 100644 --- a/ipa-server/ipa-gui/ipagui/static/css/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/static/css/Makefile.am @@ -11,4 +11,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/static/images/Makefile.am b/ipa-server/ipa-gui/ipagui/static/images/Makefile.am index d1f919848..011e24aec 100644 --- a/ipa-server/ipa-gui/ipagui/static/images/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/static/images/Makefile.am @@ -24,4 +24,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/static/images/branding/Makefile.am b/ipa-server/ipa-gui/ipagui/static/images/branding/Makefile.am index fcf2fdc11..cb0a81424 100644 --- a/ipa-server/ipa-gui/ipagui/static/images/branding/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/static/images/branding/Makefile.am @@ -11,4 +11,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/static/images/template/Makefile.am b/ipa-server/ipa-gui/ipagui/static/images/template/Makefile.am index dc769d846..a446ce637 100644 --- a/ipa-server/ipa-gui/ipagui/static/images/template/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/static/images/template/Makefile.am @@ -17,4 +17,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am b/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am index 908569afc..a2ca2289b 100644 --- a/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am @@ -17,4 +17,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am b/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am index 2f596f2ef..a0c6393fe 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am @@ -16,4 +16,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py b/ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py index 781ca35d4..a82b98888 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py @@ -104,7 +104,7 @@ class IPAPolicyController(IPAController): new_ipapolicy = ipa.entity.Entity(orig_ipapolicy_dict) new_password = ipa.entity.Entity(orig_password_dict) - + if str(new_ipapolicy.ipasearchtimelimit) != str(kw.get('ipasearchtimelimit')): policy_modified = True new_ipapolicy.setValue('ipasearchtimelimit', kw.get('ipasearchtimelimit')) @@ -158,7 +158,7 @@ class IPAPolicyController(IPAController): turbogears.flash("IPA Policy updated") raise turbogears.redirect('/ipapolicy/show') except ipaerror.IPAError, e: - turbogears.flash("Policy update failed: " + str(e) + e.detail[0]['desc']) + turbogears.flash("Policy update failed: " + str(e) + "<br/>" + e.detail[0]['desc']) return dict(form=ipapolicy_edit_form, ipapolicy=kw, tg_template='ipagui.templates.ipapolicyedit') diff --git a/ipa-server/ipa-gui/ipagui/templates/Makefile.am b/ipa-server/ipa-gui/ipagui/templates/Makefile.am index 6626ad8c2..4bf8f142d 100644 --- a/ipa-server/ipa-gui/ipagui/templates/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/templates/Makefile.am @@ -45,4 +45,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in diff --git a/ipa-server/ipa-gui/ipagui/templates/useredit.kid b/ipa-server/ipa-gui/ipagui/templates/useredit.kid index f5cb1b02e..a3d813339 100644 --- a/ipa-server/ipa-gui/ipagui/templates/useredit.kid +++ b/ipa-server/ipa-gui/ipagui/templates/useredit.kid @@ -29,10 +29,10 @@ else: ?> <div py:if='pw_expires_soon' class="warning_message"> - Password will expire in ${pw_expires_days} day${days_suffix} + ${user.get("uid")}'s password will expire in ${pw_expires_days} day${days_suffix} </div> <div py:if='pw_is_expired' class="warning_message"> - Password has expired + ${user.get("uid")}'s password has expired </div> ${form.display(action=tg.url('/user/update'), value=user, user_groups=user_groups)} diff --git a/ipa-server/ipa-gui/ipagui/templates/usershow.kid b/ipa-server/ipa-gui/ipagui/templates/usershow.kid index 8cc356b89..614988729 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usershow.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usershow.kid @@ -28,10 +28,10 @@ else: ?> <div id="alertbox" py:if='pw_expires_soon' class="warning_message"> - Password will expire in ${pw_expires_days} day${days_suffix} + ${user.get("uid")}'s password will expire in ${pw_expires_days} day${days_suffix} </div> <div id="alertbox" py:if='pw_is_expired' class="warning_message"> - Password has expired + ${user.get("uid")}'s password has expired </div> <h2 class="formsection">Identity Details</h2> diff --git a/ipa-server/ipa-gui/ipagui/tests/Makefile.am b/ipa-server/ipa-gui/ipagui/tests/Makefile.am index 9902fef72..bf06ef2fa 100644 --- a/ipa-server/ipa-gui/ipagui/tests/Makefile.am +++ b/ipa-server/ipa-gui/ipagui/tests/Makefile.am @@ -12,4 +12,5 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ *~ \ + *.pyc \ Makefile.in |