Merge branch 'master' into '33-rework-hjelp-templates'

# Conflicts:
#   aleksis/apps/hjelp/templates/hjelp/feedback.html

aleksis/apps/hjelp/forms.py

@@ -70,28 +70,28 @@ class FeedbackForm(forms.Form):
     design_rating = forms.ChoiceField(
         label=_("Design of the user interface"),
         choices=ratings,
-        widget=forms.RadioSelect(attrs={"checked": "checked"}),
+        widget=forms.RadioSelect(),
         required=True,
     )
 
     performance_rating = forms.ChoiceField(
         label=_("Speed"),
         choices=ratings,
-        widget=forms.RadioSelect(attrs={"checked": "checked", "class": "required"}),
+        widget=forms.RadioSelect(),
         required=True,
     )
 
     usability_rating = forms.ChoiceField(
         label=_("User friendliness"),
         choices=ratings,
-        widget=forms.RadioSelect(attrs={"checked": "checked"}),
+        widget=forms.RadioSelect(),
         required=True,
     )
 
     overall_rating = forms.ChoiceField(
         label=_("AlekSIS in general"),
         choices=ratings,
-        widget=forms.RadioSelect(attrs={"checked": "checked"}),
+        widget=forms.RadioSelect(),
         required=True,
     )
 

aleksis/apps/hjelp/menus.py

@@ -7,6 +7,12 @@ MENUS = {
             "url": "#",
             "icon": "help_circle",
             "root": True,
+            "validators": [
+                (
+                    "aleksis.core.util.predicates.permission_validator",
+                    "hjelp.show_menu",
+                ),
+            ],
             "submenu": [
                 {
                     "name": _("Report an issue"),

aleksis/apps/hjelp/rules.py

@@ -6,6 +6,18 @@ from aleksis.core.util.predicates import (
     is_site_preference_set,
 )
 
+# Show Hjelp menu
+show_hjelp_menu = is_site_preference_set("hjelp", "public_faq") | (
+    has_person &
+    (
+        has_global_perm("hjelp.view_faq") |
+        has_global_perm("hjelp.ask_faq") |
+        has_global_perm("hjelp.report_issue") |
+        has_global_perm("hjelp.send_feedback")
+    )
+)
+add_perm("hjelp.show_menu", show_hjelp_menu)
+
 # View FAQ
 view_faq_predicate = is_site_preference_set("hjelp", "public_faq") | (
     has_person & has_global_perm("hjelp.view_faq")

aleksis/apps/hjelp/templates/hjelp/feedback.html

@@ -15,12 +15,16 @@
             Please give us detailed and honest feedback so that we can make AlekSIS even better!
 	{% endblocktrans %}
     </p>
-    <form method="post">
+
+    <form method="post" novalidate>
         {% csrf_token %}
 
         <ul class="collection">
             <li class="collection-item">
-                <div class="row"><div class="col s12 l6">{{ form.design_rating.label }} <span class="red-text">*</span></div>
+                <div class="row"><div class="col s12 l6">{{ form.design_rating.label }}
+                  <span class="red-text">*</span>
+                  <span class="red-text">{{ form.design_rating.errors }}</span>
+                </div>
                     <div class="rating col s12 l6">
                         {% for radio in form.design_rating %}
                             {{ radio.tag }}
@@ -31,7 +35,10 @@
             <div class="hide-on-large-only">&nbsp;</div>
             </li>
             <li class="collection-item">
-                <div class="row"><div class="col s12 l6">{{ form.performance_rating.label }} <span class="red-text">*</span></div>
+                <div class="row"><div class="col s12 l6">{{ form.performance_rating.label }}
+                  <span class="red-text">*</span>
+                  <span class="red-text">{{ form.performance_rating.errors }}</span>
+                </div>
                     <div class="rating col s12 l6">
                         {% for radio in form.performance_rating %}
                             {{ radio.tag }}
@@ -42,7 +49,10 @@
             <div class="hide-on-large-only">&nbsp;</div>
             </li>
             <li class="collection-item">
-                <div class="row"><div class="col s12 l6">{{ form.usability_rating.label }} <span class="red-text">*</span></div>
+                <div class="row"><div class="col s12 l6">{{ form.usability_rating.label }}
+                  <span class="red-text">*</span>
+                  <span class="red-text">{{ form.usability_rating.errors }}</span>
+                </div>
                     <div class="rating col s12 l6">
                         {% for radio in form.usability_rating %}
                             {{ radio.tag }}
@@ -53,7 +63,10 @@
             <div class="hide-on-large-only">&nbsp;</div>
             </li>
             <li class="collection-item">
-                <div class="row"><div class="col s12 l6">{{ form.overall_rating.label }} <span class="red-text">*</span></div>
+                <div class="row"><div class="col s12 l6">{{ form.overall_rating.label }}
+                  <span class="red-text">*</span>
+                  <span class="red-text">{{ form.overall_rating.errors }}</span>
+                </div>
                     <div class="rating col s12 l6">
                         {% for radio in form.overall_rating %}
                             {{ radio.tag }}

aleksis/apps/hjelp/views.py

@@ -62,7 +62,7 @@ def ask_faq(request):
 
 
 def add_arrows(array: list):
-    return " → ".join([item for item in array if item != ""])
+    return " → ".join([item for item in array if item != "" and item.lower() != "none"])
 
 
 def issues_get_next_properties(request):