diff --git a/aleksis/apps/hjelp/admin.py b/aleksis/apps/hjelp/admin.py index 3f4c4cb97d5bb3eabfb5b1ebe49fc98c27aec6ba..5ba4e7f8eb771115645f520f8909a4c77421ea27 100644 --- a/aleksis/apps/hjelp/admin.py +++ b/aleksis/apps/hjelp/admin.py @@ -15,7 +15,7 @@ def icon_html(obj: Model) -> str: class FAQSectionAdmin(admin.ModelAdmin): - """ ModelAdmin for FAQ sections """ + """ModelAdmin for FAQ sections.""" list_display = ("name", "_icon") @@ -40,7 +40,7 @@ hide.short_description = _("Unpublish selected questions") class FAQQuestionAdmin(admin.ModelAdmin): - """ ModelAdmin for FAQ questions """ + """ModelAdmin for FAQ questions.""" list_display = ("question_text", "section", "_icon", "show") actions = [show, hide] @@ -52,7 +52,7 @@ class FAQQuestionAdmin(admin.ModelAdmin): class IssueCategoryAdmin(admin.ModelAdmin): - """ ModelAdmin for issue categories """ + """ModelAdmin for issue categories.""" list_display = ("name", "_icon", "parent", "placeholder", "free_text") diff --git a/aleksis/apps/hjelp/forms.py b/aleksis/apps/hjelp/forms.py index 059641e1e9e2ac409be8a58641ff992dafcec25f..ad5dfb242d740360b9149977a3fc478ea28108ee 100644 --- a/aleksis/apps/hjelp/forms.py +++ b/aleksis/apps/hjelp/forms.py @@ -7,13 +7,13 @@ from .models import IssueCategory class FAQForm(forms.Form): - """ Form used to allow users to send in a question """ + """Form used to allow users to send in a question.""" question = forms.CharField(widget=forms.Textarea(), label=_("Your question"), required=True) class IssueForm(forms.Form): - """ Form used to allow users to report an issue """ + """Form used to allow users to report an issue.""" category_1 = forms.ModelChoiceField( label=_("Category 1"), diff --git a/aleksis/apps/hjelp/models.py b/aleksis/apps/hjelp/models.py index 43b12ceb79122aea4d3b0e5441448c3774dcee0f..cc3d50e83275a5154c2f268ed2ee194768208257 100644 --- a/aleksis/apps/hjelp/models.py +++ b/aleksis/apps/hjelp/models.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from ckeditor.fields import RichTextField from aleksis.core.mixins import ExtensibleModel -from aleksis.core.util.model_helpers import COLOURS, ICONS +from aleksis.core.util.model_helpers import ICONS class HjelpGlobalPermissions(ExtensibleModel): @@ -81,7 +81,7 @@ class IssueCategory(ExtensibleModel): ) free_text = models.BooleanField(verbose_name=_("Free text input allowed"), default=False) placeholder = models.CharField( - max_length=100, verbose_name=_("Placeholder"), blank=True, null=True + max_length=100, verbose_name=_("Placeholder"), blank=True ) def __str__(self): diff --git a/aleksis/apps/hjelp/rules.py b/aleksis/apps/hjelp/rules.py index cc98afd141ab164461d07983814636fe8b0d6fc0..a543d7b0e9f0e11fd86d562c67217e9a575b04cb 100644 --- a/aleksis/apps/hjelp/rules.py +++ b/aleksis/apps/hjelp/rules.py @@ -1,4 +1,4 @@ -from rules import add_perm, always_allow +from rules import add_perm from aleksis.core.util.predicates import has_global_perm, has_person, is_site_preference_set diff --git a/aleksis/apps/hjelp/views.py b/aleksis/apps/hjelp/views.py index e7fd2babfa1b9caa8ead4536b33559edf65ba139..2119fe8647ae7a85479feb99831d0213889423a3 100644 --- a/aleksis/apps/hjelp/views.py +++ b/aleksis/apps/hjelp/views.py @@ -1,4 +1,3 @@ -from django.contrib.auth.decorators import login_required from django.http import JsonResponse from django.shortcuts import render from django.utils.translation import ugettext_lazy as _ @@ -15,7 +14,7 @@ from .models import FAQQuestion, FAQSection, IssueCategory @permission_required("hjelp.view_faq") def faq(request): - """ Shows the FAQ page """ + """Shows the FAQ page.""" context = { "questions": FAQQuestion.objects.filter(show=True),