diff --git a/src/postorius/forms.py b/src/postorius/forms.py index d8e9e34..708165e 100644 --- a/src/postorius/forms.py +++ b/src/postorius/forms.py @@ -737,42 +737,6 @@ 'the message. ')) -class UserNew(FieldsetForm): - - """ - Form field to add a new user - """ - display_name = forms.CharField( - label=_('User Name'), - required=True, - error_messages={'required': _('Please enter a display name.'), - 'invalid': _('Please enter a valid display name.')}) - email = forms.EmailField( - label=_("User's email address"), - error_messages={ - 'required': _("Please enter the user's email address.")}, - required=True) - password = forms.CharField( - label=_('Password'), - required=True, - error_messages={'required': _('Please enter a password.')}, - widget=forms.PasswordInput(render_value=False)) - password_repeat = forms.CharField( - label=_('Repeat password'), - required=True, - error_messages={'required': _('Please repeat the password.')}, - widget=forms.PasswordInput(render_value=False)) - - def clean(self): - cleaned_data = self.cleaned_data - password = cleaned_data.get("password") - password_repeat = cleaned_data.get("password_repeat") - if password != password_repeat: - raise forms.ValidationError(_('Passwords must be identical.')) - - return cleaned_data - - class UserSettings(FieldsetForm): """Form handling the user settings. diff --git a/src/postorius/templatetags/nav_helpers.py b/src/postorius/templatetags/nav_helpers.py index d85f248..990dcb1 100644 --- a/src/postorius/templatetags/nav_helpers.py +++ b/src/postorius/templatetags/nav_helpers.py @@ -38,11 +38,6 @@ title=title, subtitle=subtitle) -@register.simple_tag -def page_url(view_name, *args, **kwargs): - return reverse(view_name, *args, **kwargs) - - @register.simple_tag(takes_context=True) def nav_active_class(context, current, view_name): if current == view_name: diff --git a/src/postorius/views/__init__.py b/src/postorius/views/__init__.py index c1dccfd..b087541 100644 --- a/src/postorius/views/__init__.py +++ b/src/postorius/views/__init__.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License along with # Postorius. If not, see . -from postorius.views.api import * from postorius.views.list import * from postorius.views.domain import * from postorius.views.user import * diff --git a/src/postorius/views/api.py b/src/postorius/views/api.py deleted file mode 100644 index bf167b4..0000000 --- a/src/postorius/views/api.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 1998-2015 by the Free Software Foundation, Inc. -# -# This file is part of Postorius. -# -# Postorius is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# Postorius is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# Postorius. If not, see . - - -import json -import logging - - - -from django.http import HttpResponse - -from postorius import utils -from postorius.auth.decorators import * - - -logger = logging.getLogger(__name__) - - -@basic_auth_login -@loggedin_or_403 -def api_list_index(request): - client = utils.get_client() - res, content = client._connection.call('lists') - return HttpResponse(json.dumps(content['entries']), - content_type="application/json")