fix #589: forms cleanup

docs/Forms.md

@@ -11,38 +11,17 @@ Misago's admin uses [Crispy Forms](http://django-crispy-forms.readthedocs.org/en
 
 Finally, Misago defines few custom field types:
 
+
 ### `misago.core.forms.YesNoSwitch`
 
 Thin wrapper around Django's `TypedChoiceField`. In admin this field renders nice yes/no switch as its input.
 
+
 ##### Warning!
 
 `YesNoSwitch` coerces its value to `int` (eg. `0` or `1`)! Remember about this when writing code dealing with forms containing this field!
 
 
-## `misago.forums.forms`
-
-This module defines two fields you may use for making forum selections in your forms:
-
-* `ForumChoiceField` that extends `django.core.forms.ModelChoiceField`
-* `ModelMultipleChoiceField` that extends `django.core.forms.ModelMultipleChoiceField`
-
-Because those fields need to know ACL, you are required to call their `set_acl` method from your form's `__init__`:
-
-```python
-class MoveThreadsForm(forms.Form):
-    new_forum = ForumChoiceField(label=_("Move threads to forum"))
-
-    def __init__(self, *args, **kwargs):
-        self.forum = kwargs.pop('forum')
-        acl = kwargs.pop('acl')
-
-        super(MoveThreadsForm, self).__init__(*args, **kwargs)
-
-        self.fields['new_forum'].set_acl(acl)
-```
-
-
 ## Template tags
 
 Misago defines custom templates extension named `misago_forms`. This extension contains two template tags for rendering form fields:

frontend/src/components/yes-no-switch.js

@@ -10,7 +10,7 @@ export default class extends React.Component {
   }
 
   getIcon() {
-    if (this.props.value) {
+    if (!!this.props.value) {
       return this.props.iconOn || 'check_box';
     } else {
       return this.props.iconOff || 'check_box_outline_blank';
@@ -18,7 +18,7 @@ export default class extends React.Component {
   }
 
   getLabel() {
-    if (this.props.value) {
+    if (!!this.props.value) {
       return this.props.labelOn || gettext("yes");
     } else {
       return this.props.labelOff || gettext("no");

misago/acl/forms.py

@@ -1,7 +1,6 @@
+from django import forms
 from django.utils.translation import ugettext_lazy as _
 
-from misago.core import forms
-
 from .models import Role
 from .providers import providers
 

misago/categories/forms.py

@@ -1,10 +1,11 @@
 from mptt.forms import *  # noqa
 
+from django import forms
 from django.db import models
 from django.utils.html import conditional_escape, mark_safe
 from django.utils.translation import ugettext_lazy as _
 
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 from misago.core.validators import validate_sluggable
 from misago.threads.threadtypes import trees_map
 
@@ -45,47 +46,6 @@ class AdminCategoryMultipleChoiceField(
     pass
 
 
-class MisagoCategoryMixin(object):
-    def __init__(self, *args, **kwargs):
-        self.parent = None
-        if not 'queryset' in kwargs:
-            kwargs['queryset'] = Category.objects.order_by('lft')
-
-        if kwargs.get('error_messages', {}):
-            kwargs['error_messages'].update({
-                'invalid_choice': self.INVALID_CHOICE_ERROR
-            })
-        else:
-            kwargs['error_messages'] = {
-                'invalid_choice': self.INVALID_CHOICE_ERROR
-            }
-
-        super(MisagoCategoryMixin, self).__init__(*args, **kwargs)
-
-    def set_acl(self, acl=None):
-        queryset = Category.objects.root_category().get_descendants()
-        if acl:
-            allowed_ids = [0]
-            for category_id, perms in acl.get('categories', {}).items():
-                if perms.get('can_see') and perms.get('can_browse'):
-                    allowed_ids.append(category_id)
-            queryset = queryset.filter(id__in=allowed_ids)
-        self.queryset = queryset
-
-    def _get_level_indicator(self, obj):
-        level = obj.level - 1
-        return mark_safe(conditional_escape('- - ') * level)
-
-
-class CategoryChoiceField(MisagoCategoryMixin, TreeNodeChoiceField):
-    INVALID_CHOICE_ERROR = _("Select valid category.")
-
-
-class CategorysMultipleChoiceField(
-        MisagoCategoryMixin, TreeNodeMultipleChoiceField):
-    INVALID_CHOICE_ERROR = _("Select valid categories.")
-
-
 """
 Forms
 """
@@ -107,7 +67,7 @@ class CategoryFormBase(forms.ModelForm):
         help_text=_("Optional CSS class used to customize this category "
                     "appearance from templates.")
     )
-    is_closed = forms.YesNoSwitch(
+    is_closed = YesNoSwitch(
         label=_("Closed category"),
         required=False,
         help_text=_("Only members with valid permissions can post in "

misago/categories/permissions.py

@@ -1,3 +1,4 @@
+from django import forms
 from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied
 from django.http import Http404
@@ -5,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from misago.acl import algebra
 from misago.acl.decorators import return_boolean
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 from misago.users.models import AnonymousUser
 
 from .models import Category, CategoryRole, RoleCategoryACL
@@ -17,8 +18,8 @@ Admin Permissions Form
 class PermissionsForm(forms.Form):
     legend = _("Category access")
 
-    can_see = forms.YesNoSwitch(label=_("Can see category"))
-    can_browse = forms.YesNoSwitch(label=_("Can see category contents"))
+    can_see = YesNoSwitch(label=_("Can see category"))
+    can_browse = YesNoSwitch(label=_("Can see category contents"))
 
 
 def change_permissions_form(role):

misago/conf/forms.py

@@ -1,7 +1,7 @@
-from django.utils.translation import ugettext as _
-from django.utils.translation import ungettext
+from django import forms
+from django.utils.translation import ugettext as _, ungettext
 
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 
 __ALL__ = ['ChangeSettingsForm']
@@ -112,7 +112,7 @@ def create_textarea(setting, kwargs, extra):
 
 
 def create_yesno(setting, kwargs, extra):
-    return forms.YesNoSwitch(**kwargs)
+    return YesNoSwitch(**kwargs)
 
 
 FIELD_STYPES = {

misago/core/forms.py

@@ -1,10 +1,5 @@
-from datetime import datetime, timedelta
-
-from mptt.forms import *  # noqa
-
-from django.forms import *  # noqa
-from django.utils import timezone
-from django.utils.encoding import force_text
+from django.forms import (
+    DateTimeField, RadioSelect, TypedChoiceField, ValidationError)
 from django.utils.translation import ugettext_lazy as _
 
 from .utils import parse_iso8601_string

misago/core/tests/test_forms.py

@@ -1,10 +1,11 @@
+from django import forms
 from django.test import TestCase
 
-from .. import forms
+from misago.core.forms import YesNoSwitch
 
 
 class YesNoForm(forms.Form):
-    test_field = forms.YesNoSwitch(label='Hello!')
+    test_field = YesNoSwitch(label='Hello!')
 
 
 class YesNoSwitchTests(TestCase):

misago/core/tests/test_templatetags.py

@@ -1,10 +1,10 @@
+from django import forms
 from django.template import Context, Template, TemplateSyntaxError
 from django.test import TestCase
 
-from .. import forms
-from ..shortcuts import paginate
-from ..templatetags import misago_batch
-from ..utils import encode_json_html
+from misago.core.shortcuts import paginate
+from misago.core.templatetags import misago_batch
+from misago.core.utils import encode_json_html
 
 
 class CaptureTests(TestCase):

misago/search/permissions.py

@@ -1,9 +1,9 @@
+from django import forms
 from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext
 
 from misago.acl import algebra
 from misago.acl.models import Role
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 
 """
@@ -12,7 +12,7 @@ Admin Permissions Form
 class PermissionsForm(forms.Form):
     legend = _("Search")
 
-    can_search = forms.YesNoSwitch(
+    can_search = YesNoSwitch(
         label=_("Can search site"),
         initial=1
     )

misago/threads/permissions/attachments.py

@@ -1,8 +1,9 @@
+from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from misago.acl import algebra
 from misago.acl.models import Role
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 from ..models import Attachment
 
@@ -20,14 +21,14 @@ class PermissionsForm(forms.Form):
         min_value=0
     )
 
-    can_download_other_users_attachments = forms.YesNoSwitch(label=_("Can download other users attachments"))
-    can_delete_other_users_attachments = forms.YesNoSwitch(label=_("Can delete other users attachments"))
+    can_download_other_users_attachments = YesNoSwitch(label=_("Can download other users attachments"))
+    can_delete_other_users_attachments = YesNoSwitch(label=_("Can delete other users attachments"))
 
 
 class AnonymousPermissionsForm(forms.Form):
     legend = _("Attachments")
 
-    can_download_other_users_attachments = forms.YesNoSwitch(label=_("Can download attachments"))
+    can_download_other_users_attachments = YesNoSwitch(label=_("Can download attachments"))
 
 
 def change_permissions_form(role):

misago/threads/permissions/polls.py

@@ -1,3 +1,4 @@
+from django import forms
 from django.core.exceptions import PermissionDenied
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
@@ -6,7 +7,7 @@ from django.utils.translation import ungettext
 from misago.acl import algebra
 from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 from ..models import Poll, Thread
 
@@ -53,7 +54,7 @@ class RolePermissionsForm(forms.Form):
         initial=0,
         min_value=0
     )
-    can_always_see_poll_voters = forms.YesNoSwitch(
+    can_always_see_poll_voters = YesNoSwitch(
         label=_("Can always see polls voters"),
         help_text=_("Allows users to see who voted in poll even if poll votes are secret.")
     )

misago/threads/permissions/privatethreads.py

@@ -1,3 +1,4 @@
+from django import forms
 from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied
 from django.db.models import Q
@@ -8,7 +9,7 @@ from misago.acl import add_acl, algebra
 from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
 from misago.categories.models import PRIVATE_THREADS_ROOT_NAME, Category
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 from ..models import Thread
 
@@ -37,24 +38,24 @@ Admin Permissions Form
 class PermissionsForm(forms.Form):
     legend = _("Private threads")
 
-    can_use_private_threads = forms.YesNoSwitch(label=_("Can use private threads"))
-    can_start_private_threads = forms.YesNoSwitch(label=_("Can start private threads"))
+    can_use_private_threads = YesNoSwitch(label=_("Can use private threads"))
+    can_start_private_threads = YesNoSwitch(label=_("Can start private threads"))
     max_private_thread_participants = forms.IntegerField(
         label=_("Max number of users invited to private thread"),
         help_text=_("Enter 0 to don't limit number of participants."),
         initial=3,
         min_value=0
     )
-    can_add_everyone_to_private_threads = forms.YesNoSwitch(
+    can_add_everyone_to_private_threads = YesNoSwitch(
         label=_("Can add everyone to threads"),
         help_text=_("Allows user to add users that are blocking him to private threads.")
     )
-    can_report_private_threads = forms.YesNoSwitch(
+    can_report_private_threads = YesNoSwitch(
         label=_("Can report private threads"),
         help_text=_("Allows user to report private threads they are "
                     "participating in, making them accessible to moderators.")
     )
-    can_moderate_private_threads = forms.YesNoSwitch(
+    can_moderate_private_threads = YesNoSwitch(
         label=_("Can moderate private threads"),
         help_text=_("Allows user to read, reply, edit and delete content "
                     "in reported private threads.")

misago/threads/permissions/threads.py

@@ -1,3 +1,4 @@
+from django import forms
 from django.core.exceptions import PermissionDenied
 from django.db.models import Q
 from django.http import Http404
@@ -10,7 +11,7 @@ from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
 from misago.categories.models import Category, CategoryRole, RoleCategoryACL
 from misago.categories.permissions import get_categories_roles
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 from ..models import Post, Thread
 
@@ -21,7 +22,7 @@ Admin Permissions Forms
 class RolePermissionsForm(forms.Form):
     legend = _("Threads")
 
-    can_see_unapproved_content_lists = forms.YesNoSwitch(
+    can_see_unapproved_content_lists = YesNoSwitch(
         label=_("Can see unapproved content list"),
         help_text=_('Allows access to "unapproved" tab on threads lists for '
                     "easy listing of threads that are unapproved or contain "
@@ -30,7 +31,7 @@ class RolePermissionsForm(forms.Form):
                     "categories in which the user has permission to approve "
                     "content.")
     )
-    can_see_reported_content_lists = forms.YesNoSwitch(
+    can_see_reported_content_lists = YesNoSwitch(
         label=_("Can see reported content list"),
         help_text=_('Allows access to "reported" tab on threads lists for '
                     "easy listing of threads that contain reported posts. "
@@ -39,7 +40,7 @@ class RolePermissionsForm(forms.Form):
                     "categories in which the user has permission to see posts "
                     "reports.")
     )
-    can_omit_flood_protection = forms.YesNoSwitch(
+    can_omit_flood_protection = YesNoSwitch(
         label=_("Can omit flood protection"),
         help_text=_("Allows posting more frequently than flood protection would.")
     )
@@ -55,8 +56,8 @@ class CategoryPermissionsForm(forms.Form):
         choices=((0, _("Started threads")), (1, _("All threads")))
     )
 
-    can_start_threads = forms.YesNoSwitch(label=_("Can start threads"))
-    can_reply_threads = forms.YesNoSwitch(label=_("Can reply to threads"))
+    can_start_threads = YesNoSwitch(label=_("Can start threads"))
+    can_reply_threads = YesNoSwitch(label=_("Can reply to threads"))
 
     can_edit_threads = forms.TypedChoiceField(
         label=_("Can edit threads"),
@@ -103,9 +104,9 @@ class CategoryPermissionsForm(forms.Form):
             (2, _("Globally"))
         )
     )
-    can_close_threads = forms.YesNoSwitch(label=_("Can close threads"))
-    can_move_threads = forms.YesNoSwitch(label=_("Can move threads"))
-    can_merge_threads = forms.YesNoSwitch(label=_("Can merge threads"))
+    can_close_threads = YesNoSwitch(label=_("Can close threads"))
+    can_move_threads = YesNoSwitch(label=_("Can move threads"))
+    can_merge_threads = YesNoSwitch(label=_("Can merge threads"))
 
     can_edit_posts = forms.TypedChoiceField(
         label=_("Can edit posts"),
@@ -151,26 +152,26 @@ class CategoryPermissionsForm(forms.Form):
             (2, _("Number and list of likers"))
         )
     )
-    can_like_posts = forms.YesNoSwitch(
+    can_like_posts = YesNoSwitch(
         label=_("Can like posts"),
         help_text=_("Only users with this permission to see likes can like posts.")
     )
 
-    can_protect_posts = forms.YesNoSwitch(
+    can_protect_posts = YesNoSwitch(
         label=_("Can protect posts"),
         help_text=_("Only users with this permission can edit protected posts.")
     )
-    can_move_posts = forms.YesNoSwitch(
+    can_move_posts = YesNoSwitch(
         label=_("Can move posts"),
         help_text=_("Will be able to move posts to other threads.")
     )
-    can_merge_posts = forms.YesNoSwitch(label=_("Can merge posts"))
-    can_approve_content = forms.YesNoSwitch(
+    can_merge_posts = YesNoSwitch(label=_("Can merge posts"))
+    can_approve_content = YesNoSwitch(
         label=_("Can approve content"),
         help_text=_("Will be able to see and approve unapproved content.")
     )
-    can_report_content = forms.YesNoSwitch(label=_("Can report posts"))
-    can_see_reports = forms.YesNoSwitch(label=_("Can see reports"))
+    can_report_content = YesNoSwitch(label=_("Can report posts"))
+    can_see_reports = YesNoSwitch(label=_("Can see reports"))
 
     can_hide_events = forms.TypedChoiceField(
         label=_("Can hide events"),

misago/users/api/userendpoints/create.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import authenticate, get_user_model, login
-from django.core.exceptions import PermissionDenied
+from django.core.exceptions import PermissionDenied, ValidationError
 from django.utils.translation import ugettext as _
 from django.views.decorators.csrf import csrf_protect
 
@@ -7,7 +7,6 @@ from rest_framework import status
 from rest_framework.response import Response
 
 from misago.conf import settings
-from misago.core import forms
 from misago.core.mail import mail_user
 
 from ... import captcha
@@ -26,7 +25,7 @@ def create_endpoint(request):
 
     try:
         captcha.test_request(request)
-    except forms.ValidationError as e:
+    except ValidationError as e:
         form.add_error('captcha', e)
 
     if not form.is_valid():

misago/users/djangoadmin.py

@@ -9,14 +9,13 @@ Registration call is placed in :mod:`misago.users.admin`.
 
 Test for the model is placed in :mod:`misago.users.tests.test_djangoadmin_user`.
 """
+from django import forms
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.translation import ugettext as _
 
-from misago.core import forms
-
 
 # Misago user model
 User = get_user_model()

misago/users/forms/admin.py

@@ -1,10 +1,12 @@
+from django import forms
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext
 
 from misago.acl.models import Role
 from misago.conf import settings
-from misago.core import forms, threadstore
+from misago.core import threadstore
+from misago.core.forms import IsoDateTimeField, YesNoSwitch
 from misago.core.validators import validate_sluggable
 
 from ..models import (
@@ -100,7 +102,7 @@ class EditUserForm(UserBaseForm):
         required=False
     )
 
-    is_avatar_locked = forms.YesNoSwitch(
+    is_avatar_locked = YesNoSwitch(
         label=_("Lock avatar"),
         help_text=_(
             "Setting this to yes will stop user from changing "
@@ -132,7 +134,7 @@ class EditUserForm(UserBaseForm):
         widget=forms.Textarea(attrs={'rows': 3}),
         required=False
     )
-    is_signature_locked = forms.YesNoSwitch(
+    is_signature_locked = YesNoSwitch(
         label=_("Lock signature"),
         help_text=_(
             "Setting this to yes will stop user from "
@@ -156,7 +158,7 @@ class EditUserForm(UserBaseForm):
         required=False
     )
 
-    is_hiding_presence = forms.YesNoSwitch(label=_("Hides presence"))
+    is_hiding_presence = YesNoSwitch(label=_("Hides presence"))
 
     limits_private_thread_invites_to = forms.TypedChoiceField(
         label=_("Who can add user to private threads"),
@@ -238,12 +240,12 @@ def UserFormFactory(FormType, instance):
 
 def StaffFlagUserFormFactory(FormType, instance):
     staff_fields = {
-        'is_staff': forms.YesNoSwitch(
+        'is_staff': YesNoSwitch(
             label=EditUserForm.IS_STAFF_LABEL,
             help_text=EditUserForm.IS_STAFF_HELP_TEXT,
             initial=instance.is_staff
         ),
-        'is_superuser': forms.YesNoSwitch(
+        'is_superuser': YesNoSwitch(
             label=EditUserForm.IS_SUPERUSER_LABEL,
             help_text=EditUserForm.IS_SUPERUSER_HELP_TEXT,
             initial=instance.is_superuser
@@ -255,7 +257,7 @@ def StaffFlagUserFormFactory(FormType, instance):
 
 def UserIsActiveFormFactory(FormType, instance):
     is_active_fields = {
-        'is_active': forms.YesNoSwitch(
+        'is_active': YesNoSwitch(
             label=EditUserForm.IS_ACTIVE_LABEL,
             help_text=EditUserForm.IS_ACTIVE_HELP_TEXT,
             initial=instance.is_active
@@ -288,9 +290,9 @@ def EditUserFormFactory(FormType, instance,
 class SearchUsersFormBase(forms.Form):
     username = forms.CharField(label=_("Username starts with"), required=False)
     email = forms.CharField(label=_("E-mail starts with"), required=False)
-    inactive = forms.YesNoSwitch(label=_("Inactive only"))
-    disabled = forms.YesNoSwitch(label=_("Disabled only"))
-    is_staff = forms.YesNoSwitch(label=_("Admins only"))
+    inactive = YesNoSwitch(label=_("Inactive only"))
+    disabled = YesNoSwitch(label=_("Disabled only"))
+    is_staff = YesNoSwitch(label=_("Admins only"))
 
     def filter_queryset(self, criteria, queryset):
         if criteria.get('username'):
@@ -475,7 +477,7 @@ class BanUsersForm(forms.Form):
             'max_length': _("Message can't be longer than 1000 characters.")
         }
     )
-    expires_on = forms.IsoDateTimeField(
+    expires_on = IsoDateTimeField(
         label=_("Expires on"),
         required=False,
         help_text=_("Leave this field empty for set bans to never expire.")
@@ -521,7 +523,7 @@ class BanForm(forms.ModelForm):
             'max_length': _("Message can't be longer than 1000 characters.")
         }
     )
-    expires_on = forms.IsoDateTimeField(
+    expires_on = IsoDateTimeField(
         label=_("Expires on"),
         required=False,
         help_text=_("Leave this field empty for this ban to never expire.")

misago/users/forms/auth.py

@@ -1,11 +1,10 @@
+from django import forms
 from django.contrib.auth import authenticate, get_user_model
 from django.contrib.auth.forms import AuthenticationForm as BaseAuthenticationForm
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
 from django.utils.translation import ugettext_lazy as _
 
-from misago.core import forms
-
 from ..bans import get_user_ban
 from ..validators import validate_password
 

misago/users/forms/moderation.py

@@ -1,18 +1,19 @@
 from datetime import timedelta
 
+from django import forms
 from django.contrib.auth import get_user_model
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext
 
 from misago.conf import settings
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 from ..bans import ban_user
 
 
 class ModerateAvatarForm(forms.ModelForm):
-    is_avatar_locked = forms.YesNoSwitch()
+    is_avatar_locked = YesNoSwitch()
     avatar_lock_user_message = forms.CharField(required=False)
     avatar_lock_staff_message = forms.CharField(required=False)
 
@@ -30,7 +31,7 @@ class ModerateSignatureForm(forms.ModelForm):
         label=_("Signature contents"),
         widget=forms.Textarea(attrs={'rows': 3}),
         required=False)
-    is_signature_locked = forms.YesNoSwitch(
+    is_signature_locked = YesNoSwitch(
         label=_("Lock signature"),
         help_text=_("Setting this to yes will stop user from "
                     "making changes to his/her signature."))

misago/users/forms/options.py

@@ -1,16 +1,17 @@
+from django import forms
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext
 
 from misago.conf import settings
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 from ..models import AUTO_SUBSCRIBE_CHOICES, PRIVATE_THREAD_INVITES_LIMITS_CHOICES
 from ..validators import validate_email, validate_password
 
 
 class ForumOptionsForm(forms.ModelForm):
-    is_hiding_presence = forms.YesNoSwitch()
+    is_hiding_presence = YesNoSwitch()
 
     limits_private_thread_invites_to = forms.TypedChoiceField(
         coerce=int, choices=PRIVATE_THREAD_INVITES_LIMITS_CHOICES)

misago/users/forms/register.py

@@ -1,4 +1,4 @@
-from misago.core import forms
+from django import forms
 
 from .. import validators
 

misago/users/forms/rename.py

@@ -1,7 +1,6 @@
+from django import forms
 from django.utils.translation import ugettext_lazy as _
 
-from misago.core import forms
-
 from ..validators import validate_username
 
 

misago/users/permissions/account.py

@@ -1,8 +1,9 @@
+from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from misago.acl import algebra
 from misago.acl.models import Role
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 
 """
@@ -24,10 +25,10 @@ class PermissionsForm(forms.Form):
         min_value=0,
         initial=0
     )
-    can_have_signature = forms.YesNoSwitch(label=_("Can have signature"))
-    allow_signature_links = forms.YesNoSwitch(label=_("Can put links in signature"))
-    allow_signature_images = forms.YesNoSwitch(label=_("Can put images in signature"))
-    allow_signature_blocks = forms.YesNoSwitch(
+    can_have_signature = YesNoSwitch(label=_("Can have signature"))
+    allow_signature_links = YesNoSwitch(label=_("Can put links in signature"))
+    allow_signature_images = YesNoSwitch(label=_("Can put images in signature"))
+    allow_signature_blocks = YesNoSwitch(
         label=_("Can use text blocks in signature"),
         help_text=_("Controls whether or not users can put quote, code, "
                     "spoiler blocks and horizontal lines in signatures.")

misago/users/permissions/delete.py

@@ -1,5 +1,6 @@
 from datetime import timedelta
 
+from django import forms
 from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied
 from django.utils import timezone
@@ -9,7 +10,6 @@ from django.utils.translation import ungettext
 from misago.acl import algebra
 from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
-from misago.core import forms
 
 
 """

misago/users/permissions/moderation.py

@@ -1,5 +1,6 @@
 from datetime import timedelta
 
+from django import forms
 from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied
 from django.template.defaultfilters import date as format_date
@@ -9,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _
 from misago.acl import algebra
 from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 from ..bans import get_user_ban
 
@@ -20,17 +21,17 @@ Admin Permissions Form
 class PermissionsForm(forms.Form):
     legend = _("Users moderation")
 
-    can_rename_users = forms.YesNoSwitch(label=_("Can rename users"))
-    can_moderate_avatars = forms.YesNoSwitch(label=_("Can moderate avatars"))
-    can_moderate_signatures = forms.YesNoSwitch(label=_("Can moderate signatures"))
-    can_ban_users = forms.YesNoSwitch(label=_("Can ban users"))
+    can_rename_users = YesNoSwitch(label=_("Can rename users"))
+    can_moderate_avatars = YesNoSwitch(label=_("Can moderate avatars"))
+    can_moderate_signatures = YesNoSwitch(label=_("Can moderate signatures"))
+    can_ban_users = YesNoSwitch(label=_("Can ban users"))
     max_ban_length = forms.IntegerField(
         label=_("Max length, in days, of imposed ban"),
         help_text=_("Enter zero to let moderators impose permanent bans."),
         min_value=0,
         initial=0
     )
-    can_lift_bans = forms.YesNoSwitch(label=_("Can lift bans"))
+    can_lift_bans = YesNoSwitch(label=_("Can lift bans"))
     max_lifted_ban_length = forms.IntegerField(
         label=_("Max length, in days, of lifted ban"),
         help_text=_("Enter zero to let moderators lift permanent bans."),

misago/users/permissions/profiles.py

@@ -1,3 +1,4 @@
+from django import forms
 from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied
 from django.utils.translation import ugettext_lazy as _
@@ -5,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
 from misago.acl import algebra
 from misago.acl.decorators import return_boolean
 from misago.acl.models import Role
-from misago.core import forms
+from misago.core.forms import YesNoSwitch
 
 from .decorators import authenticated_only
 
@@ -13,18 +14,18 @@ from .decorators import authenticated_only
 """
 Admin Permissions Form
 """
-CAN_BROWSE_USERS_LIST = forms.YesNoSwitch(
+CAN_BROWSE_USERS_LIST = YesNoSwitch(
     label=_("Can browse users list"),
     initial=1
 )
-CAN_SEARCH_USERS = forms.YesNoSwitch(
+CAN_SEARCH_USERS = YesNoSwitch(
     label=_("Can search user profiles"),
     initial=1
 )
-CAN_SEE_USER_NAME_HISTORY = forms.YesNoSwitch(
+CAN_SEE_USER_NAME_HISTORY = YesNoSwitch(
     label=_("Can see other members name history")
 )
-CAN_SEE_BAN_DETAILS = forms.YesNoSwitch(
+CAN_SEE_BAN_DETAILS = YesNoSwitch(
     label=_("Can see members bans details"),
     help_text=_("Allows users with this permission to see user and staff ban messages.")
 )
@@ -42,23 +43,23 @@ class LimitedPermissionsForm(forms.Form):
 class PermissionsForm(LimitedPermissionsForm):
     can_browse_users_list = CAN_BROWSE_USERS_LIST
     can_search_users = CAN_SEARCH_USERS
-    can_follow_users = forms.YesNoSwitch(
+    can_follow_users = YesNoSwitch(
         label=_("Can follow other users"),
         initial=1
     )
-    can_be_blocked = forms.YesNoSwitch(
+    can_be_blocked = YesNoSwitch(
         label=_("Can be blocked by other users"),
         initial=0
     )
     can_see_users_name_history = CAN_SEE_USER_NAME_HISTORY
     can_see_ban_details = CAN_SEE_BAN_DETAILS
-    can_see_users_emails = forms.YesNoSwitch(
+    can_see_users_emails = YesNoSwitch(
         label=_("Can see members e-mails")
     )
-    can_see_users_ips = forms.YesNoSwitch(
+    can_see_users_ips = YesNoSwitch(
         label=_("Can see members IPs")
     )
-    can_see_hidden_users = forms.YesNoSwitch(
+    can_see_hidden_users = YesNoSwitch(
         label=_("Can see members that hide their presence")
     )
 

misago/users/tests/test_users_api.py

@@ -302,6 +302,35 @@ class UserCategoriesOptionsTests(AuthenticatedUserTestCase):
         self.assertEqual(self.user.subscribe_to_started_threads, 2)
         self.assertEqual(self.user.subscribe_to_replied_threads, 1)
 
+        response = self.client.post(self.link, data={
+            'is_hiding_presence': 'true',
+            'limits_private_thread_invites_to': 1,
+            'subscribe_to_started_threads': 2,
+            'subscribe_to_replied_threads': 1
+        })
+        self.assertEqual(response.status_code, 200)
+
+        self.reload_user();
+
+        self.assertTrue(self.user.is_hiding_presence)
+        self.assertEqual(self.user.limits_private_thread_invites_to, 1)
+        self.assertEqual(self.user.subscribe_to_started_threads, 2)
+        self.assertEqual(self.user.subscribe_to_replied_threads, 1)
+
+        response = self.client.post(self.link, data={
+            'is_hiding_presence': 'false',
+            'limits_private_thread_invites_to': 1,
+            'subscribe_to_started_threads': 2,
+            'subscribe_to_replied_threads': 1
+        })
+        self.assertEqual(response.status_code, 200)
+
+        self.reload_user();
+
+        self.assertFalse(self.user.is_hiding_presence)
+        self.assertEqual(self.user.limits_private_thread_invites_to, 1)
+        self.assertEqual(self.user.subscribe_to_started_threads, 2)
+        self.assertEqual(self.user.subscribe_to_replied_threads, 1)
 
 class UserFollowTests(AuthenticatedUserTestCase):
     """