diff options
| author | Kevin McCarthy <kmccarth@redhat.com> | 2007-09-07 16:53:34 -0700 |
|---|---|---|
| committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-09-07 16:53:34 -0700 |
| commit | 903e11631cfcf13bab3ea38f4f952f3a093afdd4 (patch) | |
| tree | 33e229b4cf03b62651b477e72c08191e6253d206 | |
| parent | 9bb9dbae42d662ef496f0e1a2ceb9b3f6a4b7a68 (diff) | |
| download | freeipa-903e11631cfcf13bab3ea38f4f952f3a093afdd4.tar.gz freeipa-903e11631cfcf13bab3ea38f4f952f3a093afdd4.tar.xz freeipa-903e11631cfcf13bab3ea38f4f952f3a093afdd4.zip | |
Fix duplicate entry error to be more descriptive.
Add TurboGears to required package list
Clear password on Edit Person page.
Change uidnumber/gidnumber on Add Person to say 'Generated by server'
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/controllers.py | 8 | ||||
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/forms/user.py | 1 | ||||
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/usernewform.kid | 8 | ||||
| -rw-r--r-- | ipa-server/ipa-install/README | 1 |
4 files changed, 11 insertions, 7 deletions
diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py index 538e66b40..ad4d31a95 100644 --- a/ipa-server/ipa-gui/ipagui/controllers.py +++ b/ipa-server/ipa-gui/ipagui/controllers.py @@ -94,6 +94,10 @@ class Root(controllers.RootController): rv = client.add_user(new_user) turbogears.flash("%s added!" % kw['uid']) raise turbogears.redirect('/usershow', uid=kw['uid']) + except ipaerror.exception_for(ipaerror.LDAP_DUPLICATE): + turbogears.flash("Person with login '%s' already exists" % + kw.get('uid')) + return dict(form=user_new_form, tg_template='ipagui.templates.usernew') except ipaerror.IPAError, e: turbogears.flash("User add failed: " + str(e)) return dict(form=user_new_form, tg_template='ipagui.templates.usernew') @@ -107,6 +111,10 @@ class Root(controllers.RootController): user = client.get_user_by_uid(uid, user_fields) user_dict = user.toDict() + # Edit shouldn't fill in the password field. + if user_dict.has_key('userpassword'): + del(user_dict['userpassword']) + # store a copy of the original user for the update later user_data = b64encode(dumps(user_dict)) user_dict['user_orig'] = user_data diff --git a/ipa-server/ipa-gui/ipagui/forms/user.py b/ipa-server/ipa-gui/ipagui/forms/user.py index 078e06ddd..3c5d8362c 100644 --- a/ipa-server/ipa-gui/ipagui/forms/user.py +++ b/ipa-server/ipa-gui/ipagui/forms/user.py @@ -43,7 +43,6 @@ class UserNewForm(widgets.Form): params = ['user'] fields = [UserFields.uid, UserFields.givenname, - UserFields.uidnumber, UserFields.gidnumber, UserFields.sn, UserFields.mail] validator = UserNewValidator() diff --git a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid index daf131432..0c1ff86b5 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid @@ -125,9 +125,7 @@ py:content="user.uidnumber.label" />: </th> <td> - <span py:replace="user.uidnumber.display(value_for(user.uidnumber))" /> - <span py:if="tg.errors.get('uidnumber')" class="fielderror" - py:content="tg.errors.get('uidnumber')" /> + Generated by server </td> </tr> @@ -137,9 +135,7 @@ py:content="user.gidnumber.label" />: </th> <td> - <span py:replace="user.gidnumber.display(value_for(user.gidnumber))" /> - <span py:if="tg.errors.get('gidnumber')" class="fielderror" - py:content="tg.errors.get('gidnumber')" /> + Generated by server </td> </tr> </table> diff --git a/ipa-server/ipa-install/README b/ipa-server/ipa-install/README index 802aee9b7..d985cfd96 100644 --- a/ipa-server/ipa-install/README +++ b/ipa-server/ipa-install/README @@ -18,6 +18,7 @@ mozldap-devel mod_python gcc python-ldap +TurboGears Installation example: |