diff --git a/pillar/web/settings/routes.py b/pillar/web/settings/routes.py index 5ed1d9fd..9623c79f 100644 --- a/pillar/web/settings/routes.py +++ b/pillar/web/settings/routes.py @@ -23,13 +23,10 @@ def profile(): api = system_util.pillar_api() user = User.find(current_user.objectid, api=api) - form = forms.UserProfileForm( - full_name=user.full_name, - username=user.username) + form = forms.UserProfileForm(username=user.username) if form.validate_on_submit(): try: - user.full_name = form.full_name.data user.username = form.username.data user.update(api=api) flash("Profile updated", 'success') diff --git a/pillar/web/users/forms.py b/pillar/web/users/forms.py index 316813c9..3ba76c65 100644 --- a/pillar/web/users/forms.py +++ b/pillar/web/users/forms.py @@ -24,14 +24,13 @@ class UserLoginForm(Form): class UserProfileForm(Form): - full_name = StringField('Full Name', validators=[DataRequired(), Length( - min=3, max=128, message="Min. 3 and max. 128 chars please")]) username = StringField('Username', validators=[DataRequired(), Length( min=3, max=128, message="Min. 3, max. 128 chars please"), Regexp( r'^[\w.@+-]+$', message="Please do not use spaces")]) def __init__(self, csrf_enabled=False, *args, **kwargs): super().__init__(csrf_enabled=csrf_enabled, *args, **kwargs) + self.user = None def validate(self): rv = super().validate() diff --git a/src/templates/users/settings/profile.pug b/src/templates/users/settings/profile.pug index 5d872da0..339b8e66 100644 --- a/src/templates/users/settings/profile.pug +++ b/src/templates/users/settings/profile.pug @@ -11,13 +11,6 @@ .settings-form form#settings-form(method='POST', action="{{url_for('settings.profile')}}") .left - .form-group - | {{ form.full_name.label }} - | {{ form.full_name(size=20, class='form-control') }} - | {% if form.full_name.errors %} - | {% for error in form.full_name.errors %}{{ error|e }}{% endfor %} - | {% endif %} - .form-group | {{ form.username.label }} | {{ form.username(size=20, class='form-control') }} @@ -25,8 +18,15 @@ | {% for error in form.username.errors %}{{ error|e }}{% endfor %} | {% endif %} - .form-group.settings-password - | {{ _("Change your password at") }} #[a(href="https://blender.org/id/change") Blender ID] + .form-group + label {{ _("Full name") }} + p {{ current_user.full_name }} + .form-group + label {{ _("E-mail") }} + p {{ current_user.email }} + + .form-group + | {{ _("Change your full name, email, and password at") }} #[a(href="https://blender.org/id/",target='_blank') Blender ID]. .right .settings-avatar