kallithea Changeset - 2b1928873c0a

Changeset - 2b1928873c0a

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 10 years ago 2015-07-31 15:44:07
madski@unity3d.com

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.

4 files changed with 6 insertions and 6 deletions:

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

0 comments (0 inline, 0 general)

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -119,12 +119,13 @@ class UsersController(BaseController): @@
         return render('admin/users/users.html')
     def create(self):
         """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:
             form_result = user_form.to_python(dict(request.POST))
             user = user_model.create(form_result)
             usr = form_result['username']
@@ @@ -150,12 +151,13 @@ class UsersController(BaseController): @@
         return redirect(url('users'))
     def new(self, format='html'):
         """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):
         """PUT /users/id: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />

kallithea/model/forms.py

➞

Show inline comments

@@ @@ -117,14 +117,14 @@ def UserForm(edit=False, old_data={}): @@
                                                         'password_confirmation')]
         active = v.StringBoolean(if_missing=False)
         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
 def UserGroupForm(edit=False, old_data={}, available_members=[]):
     class _UserGroupForm(formencode.Schema):
         allow_extra_fields = True

kallithea/templates/admin/my_account/my_account_profile.html

➞

Show inline comments

@@ @@ -30,14 +30,12 @@ ${h.form(url('my_account'), method='post @@
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </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>
              <div class="field">
                 <div class="label">
                     <label for="name">${_('First Name')}:</label>

kallithea/templates/admin/users/user_add.html

➞

Show inline comments

@@ @@ -75,26 +75,26 @@ @@
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </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>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True,checked='checked')}
                 </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>
         </div>
     </div>
     ${h.end_form()}

0 comments (0 inline, 0 general)