Skip to content
Snippets Groups Projects
Verified Commit 1532094b authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

[Reformat] black

parent fcc43eff
No related branches found
No related tags found
No related merge requests found
#noqa
# noqa
from django.contrib import admin
from django.db.models import Model
......
......@@ -2,7 +2,7 @@ from aleksis.core.util.apps import AppConfig
class HjelpConfig(AppConfig):
name = 'aleksis.apps.hjelp'
name = "aleksis.apps.hjelp"
verbose_name = "AlekSIS — Hjelp (Support)"
urls = {
......
......@@ -12,19 +12,21 @@ MENUS = {
"name": _("Report an issue"),
"url": "report_issue",
"icon": "bug_report",
"validators": ["menu_generator.validators.is_authenticated", "aleksis.core.util.core_helpers.has_person"],
"validators": [
"menu_generator.validators.is_authenticated",
"aleksis.core.util.core_helpers.has_person",
],
},
{
"name": _("Give feedback"),
"url": "feedback",
"icon": "message_alert",
"validators": ["menu_generator.validators.is_authenticated", "aleksis.core.util.core_helpers.has_person"],
},
{
"name": _("FAQ"),
"url": "faq",
"icon": "question_answer",
"validators": [
"menu_generator.validators.is_authenticated",
"aleksis.core.util.core_helpers.has_person",
],
},
{"name": _("FAQ"), "url": "faq", "icon": "question_answer",},
],
}
]
......
This diff is collapsed.
This diff is collapsed.
......@@ -7,13 +7,15 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('hjelp', '0002_add_bug_report'),
("hjelp", "0002_add_bug_report"),
]
operations = [
migrations.AlterField(
model_name='faqquestion',
name='answer_text',
field=ckeditor.fields.RichTextField(help_text='Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must have the CSS class <em>browser-default</em>. In this case, please use the manual editor mode.'),
model_name="faqquestion",
name="answer_text",
field=ckeditor.fields.RichTextField(
help_text="Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must have the CSS class <em>browser-default</em>. In this case, please use the manual editor mode."
),
),
]
......@@ -7,28 +7,36 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('hjelp', '0003_alter_faqquestion_answer_text_field'),
("hjelp", "0003_alter_faqquestion_answer_text_field"),
]
operations = [
migrations.AddField(
model_name='faqquestion',
name='extended_data',
field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False),
model_name="faqquestion",
name="extended_data",
field=django.contrib.postgres.fields.jsonb.JSONField(
default=dict, editable=False
),
),
migrations.AddField(
model_name='faqsection',
name='extended_data',
field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False),
model_name="faqsection",
name="extended_data",
field=django.contrib.postgres.fields.jsonb.JSONField(
default=dict, editable=False
),
),
migrations.AddField(
model_name='rebuscategory',
name='extended_data',
field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False),
model_name="rebuscategory",
name="extended_data",
field=django.contrib.postgres.fields.jsonb.JSONField(
default=dict, editable=False
),
),
migrations.AddField(
model_name='support',
name='extended_data',
field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False),
model_name="support",
name="extended_data",
field=django.contrib.postgres.fields.jsonb.JSONField(
default=dict, editable=False
),
),
]
......@@ -14,15 +14,20 @@ class Support(ExtensibleModel):
managed = False
permissions = (
("report_issue", _("Can report issues")),
("send_feedback", _("Can send feedback"))
("send_feedback", _("Can send feedback")),
)
class FAQSection(ExtensibleModel):
name = models.CharField(max_length=200, verbose_name=_("Name"))
icon = models.CharField(max_length=50, blank=True, default="question_answer", choices=ICONS,
verbose_name=_("Icon"))
icon = models.CharField(
max_length=50,
blank=True,
default="question_answer",
choices=ICONS,
verbose_name=_("Icon"),
)
def __str__(self):
return self.name
......@@ -34,17 +39,32 @@ class FAQSection(ExtensibleModel):
class FAQQuestion(ExtensibleModel):
question_text = models.TextField(verbose_name=_("Question"))
icon = models.CharField(max_length=50, blank=True, default="question_answer", choices=ICONS,
verbose_name=_("Icon"))
icon = models.CharField(
max_length=50,
blank=True,
default="question_answer",
choices=ICONS,
verbose_name=_("Icon"),
)
show = models.BooleanField(verbose_name=_("Show"), default=False)
answer_text = RichTextField(verbose_name=_("Answer"), help_text=_("Because of our CSS framework the HTML tag "
"<strong>&lt;ul&gt;</strong> must have the CSS "
"class <em>browser-default</em>. In this case, please "
"use the manual editor mode."))
section = models.ForeignKey(FAQSection, on_delete=models.CASCADE, blank=True, related_name="questions",
verbose_name=_("FAQ Section"))
answer_text = RichTextField(
verbose_name=_("Answer"),
help_text=_(
"Because of our CSS framework the HTML tag "
"<strong>&lt;ul&gt;</strong> must have the CSS "
"class <em>browser-default</em>. In this case, please "
"use the manual editor mode."
),
)
section = models.ForeignKey(
FAQSection,
on_delete=models.CASCADE,
blank=True,
related_name="questions",
verbose_name=_("FAQ Section"),
)
def __str__(self):
return self.question_text
......@@ -56,12 +76,27 @@ class FAQQuestion(ExtensibleModel):
class IssueCategory(ExtensibleModel):
name = models.CharField(max_length=40, verbose_name=_("Name"))
icon = models.CharField(max_length=50, blank=True, default="bug_report", choices=ICONS,
verbose_name=_("Icon"))
parent = models.ForeignKey("self", related_name="children", on_delete=models.CASCADE, blank=True,
null=True, verbose_name=_("Parent category"))
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)
icon = models.CharField(
max_length=50,
blank=True,
default="bug_report",
choices=ICONS,
verbose_name=_("Icon"),
)
parent = models.ForeignKey(
"self",
related_name="children",
on_delete=models.CASCADE,
blank=True,
null=True,
verbose_name=_("Parent category"),
)
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
)
def __str__(self):
return self.name
......
......@@ -7,5 +7,9 @@ urlpatterns = [
path("feedback/", views.feedback, name="feedback"),
path("faq/", views.faq, name="faq"),
path("faq/ask/", views.ask_faq, name="ask_faq"),
path("issues/get_next_properties/", views.issues_get_next_properties, name="issues_get_next_properties"),
path(
"issues/get_next_properties/",
views.issues_get_next_properties,
name="issues_get_next_properties",
),
]
......@@ -37,7 +37,11 @@ def ask_faq(request):
)
act.save()
context = {"description": [question], "user": request.user, "type": _("FAQ question")}
context = {
"description": [question],
"user": request.user,
"type": _("FAQ question"),
}
send_templated_mail(
template_name="hjelp",
from_email=f"{request.user.get_full_name()} <{request.user.email}>",
......@@ -100,7 +104,8 @@ def rebus(request):
# Send mail
context = {
"description": [add_arrows(
"description": [
add_arrows(
[
bug_category_1,
bug_category_2,
......@@ -125,9 +130,7 @@ def rebus(request):
else:
form = IssueForm()
return render(
request, "hjelp/rebus.html", {"form": form}
)
return render(request, "hjelp/rebus.html", {"form": form})
@login_required
......@@ -154,7 +157,15 @@ def feedback(request):
# Send mail
context = {
"description": [design_rating, performance_rating, usability_rating, overall_rating, more, apps, ideas],
"description": [
design_rating,
performance_rating,
usability_rating,
overall_rating,
more,
apps,
ideas,
],
"user": request.user,
"type": _("Feedback"),
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment