Mercurial > kallithea
changeset 5341:2b1928873c0a
users: cleanup of handling of the extern_type and extern_name fields in html forms
Note: There is controller support for editing extern_type and extern_name but no UI.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 31 Jul 2015 15:44:07 +0200 |
parents | e50a56e61b23 |
children | 40cfdd004bf6 |
files | kallithea/controllers/admin/users.py kallithea/model/forms.py kallithea/templates/admin/my_account/my_account_profile.html kallithea/templates/admin/users/user_add.html |
diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/users.py Fri Jul 31 15:44:07 2015 +0200 +++ b/kallithea/controllers/admin/users.py Fri Jul 31 15:44:07 2015 +0200 @@ -122,6 +122,7 @@ """POST /users: Create a new item""" # url('users') c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name + c.default_extern_name = auth_modules.auth_internal.KallitheaAuthPlugin.name user_model = UserModel() user_form = UserForm()() try: @@ -153,6 +154,7 @@ """GET /users/new: Form to create a new item""" # url('new_user') c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name + c.default_extern_name = auth_modules.auth_internal.KallitheaAuthPlugin.name return render('admin/users/user_add.html') def update(self, id):
--- a/kallithea/model/forms.py Fri Jul 31 15:44:07 2015 +0200 +++ b/kallithea/model/forms.py Fri Jul 31 15:44:07 2015 +0200 @@ -120,8 +120,8 @@ firstname = v.UnicodeString(strip=True, min=1, not_empty=False) lastname = v.UnicodeString(strip=True, min=1, not_empty=False) email = All(v.Email(not_empty=True), v.UniqSystemEmail(old_data)) - extern_name = v.UnicodeString(strip=True) - extern_type = v.UnicodeString(strip=True) + extern_name = v.UnicodeString(strip=True, if_missing=None) + extern_type = v.UnicodeString(strip=True, if_missing=None) return _UserForm
--- a/kallithea/templates/admin/my_account/my_account_profile.html Fri Jul 31 15:44:07 2015 +0200 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Fri Jul 31 15:44:07 2015 +0200 @@ -33,8 +33,6 @@ </div> <div class="input"> ${h.text('username',class_='medium%s' % disabled, readonly=readonly)} - ${h.hidden('extern_name', c.extern_name)} - ${h.hidden('extern_type', c.extern_type)} </div> </div>
--- a/kallithea/templates/admin/users/user_add.html Fri Jul 31 15:44:07 2015 +0200 +++ b/kallithea/templates/admin/users/user_add.html Fri Jul 31 15:44:07 2015 +0200 @@ -78,8 +78,6 @@ </div> <div class="input"> ${h.text('email',class_='small')} - ${h.hidden('extern_name', c.default_extern_type)} - ${h.hidden('extern_type', c.default_extern_type)} </div> </div> @@ -92,6 +90,8 @@ </div> </div> + ${h.hidden('extern_type', c.default_extern_type)} + ${h.hidden('extern_name', c.default_extern_name)} <div class="buttons"> ${h.submit('save',_('Save'),class_="btn")} </div>