Merge branch 'master' into 474-check-for-correct-semantic-html-elements

CHANGELOG.rst

@@ -12,11 +12,25 @@ Unreleased
 Changed
 ~~~~~~~
 
+* Use semantically correct html elements for headings and alerts.
+
+
+`2.0b2` - 2021-06-15
+--------------------
+
+Added
+~~~~~~~
+
+* Add option to disable dashboard auto updating as a user and sitewide.
+
+Changed
+~~~~~~~
+
 * Add verbose names for all preference sections.
 * Add verbose names for all openid connect scopes and show them in grant
   view.
 * Include public dashboard in navigation
-* Use semantically correct html elements for headings and alerts.
+* Update German translations.
 
 Fixed
 ~~~~~
@@ -252,3 +266,4 @@ Fixed
 .. _2.0a2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0a2
 .. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b0
 .. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b1
+.. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b2

aleksis/core/preferences.py

@@ -386,3 +386,23 @@ class PDFFileExpirationDuration(IntegerPreference):
     default = 3
     verbose_name = _("PDF file expiration duration")
     help_text = _("in minutes")
+
+
+@person_preferences_registry.register
+class AutoUpdatingDashboard(BooleanPreference):
+    """User preference for automatically updating the dashboard."""
+
+    section = general
+    name = "automatically_update_dashboard"
+    default = True
+    verbose_name = _("Automatically update the dashboard and its widgets")
+
+
+@site_preferences_registry.register
+class AutoUpdatingDashboardSite(BooleanPreference):
+    """Automatic updating of dashboard."""
+
+    section = general
+    name = "automatically_update_dashboard_site"
+    default = True
+    verbose_name = _("Automatically update the dashboard and its widgets sitewide")

aleksis/core/templates/core/index.html

@@ -108,5 +108,7 @@
     </div>
   {% endif %}
 
-  <script type="text/javascript" src="{% static "js/include_ajax_live.js" %}"></script>
+  {% if user.person.preferences.general__automatically_update_dashboard and request.site.preferences.general__automatically_update_dashboard_site %}
+    <script type="text/javascript" src="{% static "js/include_ajax_live.js" %}"></script>
+  {% endif %}
 {% endblock %}