upgrade to django-sodar-core v1.1.2 (#2068, #2095)

Author: mikkonie

CHANGELOG.rst

@@ -13,6 +13,7 @@ Added
 
 - **General**
     - drf-spectacular support (#2051)
+    - ``PROJECTROLES_SUPPORT_CONTACT`` setting support (#2095)
 - **Landingzones**
     - Site read-only mode support (#2051)
 - **Samplesheets**
@@ -26,7 +27,7 @@ Changed
 -------
 
 - **General**
-    - Upgrade to django-sodar-core v1.1.1 (#2051)
+    - Upgrade to django-sodar-core v1.1.2 (#2051, #2068, #2095)
     - Upgrade to python-irodsclient v3.0.0 (#2079)
 - **Landingzones**
     - Define app settings as ``PluginAppSettingDef`` objects (#2051)
@@ -47,6 +48,7 @@ Removed
 
 - **General**
     - DRF generateschema support (#2051)
+    - ``SODAR_SUPPORT_EMAIL`` and ``SODAR_SUPPORT_EMAIL`` settings (#2095)
 
 
 v1.0.1 (2025-03-12)

config/settings/base.py

@@ -641,6 +641,7 @@ def set_logging(level=None):
     'This site is currently in read-only mode. Modifying data is not permitted.'
     'This includes landing zone operations.',
 )
+PROJECTROLES_SUPPORT_CONTACT = env.str('PROJECTROLES_SUPPORT_CONTACT', None)
 
 # Warn about unsupported browsers (IE)
 PROJECTROLES_BROWSER_WARNING = True
@@ -676,13 +677,6 @@ def set_logging(level=None):
 )
 
 
-# SODAR site specific settings (not derived from SODAR Core)
-SODAR_SUPPORT_EMAIL = env.str(
-    'SODAR_SUPPORT_EMAIL', '[email protected]'
-)
-SODAR_SUPPORT_NAME = env.str('SODAR_SUPPORT_NAME', 'CUBI Helpdesk')
-
-
 # iRODS settings shared by iRODS using apps
 ENABLE_IRODS = env.bool('ENABLE_IRODS', True)
 IRODS_HOST = env.str('IRODS_HOST', '127.0.0.1')

docs_manual/source/sodar_release_notes.rst

@@ -15,7 +15,8 @@ Release for SODAR Core 1.1 upgrade and feature updates.
 
 - Add landing zone validation and moving progress indicators
 - Upgrade to python-irodsclient v3.0
-- Upgrade to SODAR Core v1.1.1
+- Upgrade to SODAR Core v1.1.2
+- Replace SODAR_SUPPORT_* settings with PROJECTROLES_SUPPORT_CONTACT
 - `SODAR Core v1.1 updates <https://sodar-core.readthedocs.io/en/latest/major_changes.html#v1-1-1-2025-03-11>`_:
   Project deletion, project leaving, paginated project list, site read-only
   mode, etc.

requirements/base.txt

@@ -80,8 +80,8 @@ mistune==3.1.0
 django-autocomplete-light==3.11.0
 
 # SODAR Core
-django-sodar-core==1.1.1
-# -e git+https://github.com/bihealth/sodar-core.git@12186b969779c23a5467c8c714be3c86e5fdc5b8#egg=django-sodar-core
+django-sodar-core==1.1.2
+# -e git+https://github.com/bihealth/sodar-core.git@916f88979a94d22a52eb50be9779724ef34d8eae#egg=django-sodar-core
 
 # Celery
 celery==5.4.0

sodar/templates/include_examples/_footer.html.example

@@ -1,12 +1,14 @@
 {% load projectroles_common_tags %}
 
 {% get_django_setting 'SITE_TITLE' as site_title %}
-{% get_django_setting 'SODAR_SUPPORT_EMAIL' as support_email %}
-{% get_django_setting 'SODAR_SUPPORT_NAME' as support_name %}
+{% get_django_setting 'PROJECTROLES_SUPPORT_CONTACT' as support_contact %}
+
 
 Developed by BIH CUBI.
-{% if support_email %}
+{% if support_contact %}
   For support please contact
-  <a href="mailto:{{ support_email }}">{% if support_name %}{{ support_name }}{% else %}{{ support_email }}{% endif %}</a>.
+  {% with support_contact|split:':' as sc_split %}
+    <a href="mailto:{{ sc_split.1 }}">{{ sc_split.0 }}</a>.
+  {% endwith %}
 {% endif %}
 {{ site_title }} v{% site_version %}