remove PROJECTROLES_HIDE_APP_LINKS support (#1143)

bihealth · Mar 5, 2024 · a3eb485 · a3eb485
1 parent 46cb166
commit a3eb485
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -32,6 +32,8 @@ Removed
 - **General**
     - SAML support (#1368)
     - Python v3.8 support (#1382)
+- **Projectroles**
+    - ``PROJECTROLES_HIDE_APP_LINKS`` setting (#1143)
 
 
 v0.13.4 (2024-02-16)

diff --git a/config/settings/base.py b/config/settings/base.py
@@ -586,8 +586,6 @@ def set_logging(level=None):
 PROJECTROLES_HIDE_PROJECT_APPS = env.list(
     'PROJECTROLES_HIDE_PROJECT_APPS', None, []
 )
-# NOTE: This setting has been deprecated and will be removed in v0.14
-PROJECTROLES_HIDE_APP_LINKS = env.list('PROJECTROLES_HIDE_APP_LINKS', None, [])
 
 # Set limit for delegate roles per project (if 0, no limit is applied)
 PROJECTROLES_DELEGATE_LIMIT = env.int('PROJECTROLES_DELEGATE_LIMIT', 1)

diff --git a/docs/source/app_projectroles_settings.rst b/docs/source/app_projectroles_settings.rst
@@ -244,9 +244,6 @@ The following projectroles settings are **optional**:
     app views and URLs are still accessible via other links or knowing the URL.
     The names should correspond to the ``name`` property in project app plugins
     (list)
-``PROJECTROLES_HIDE_APP_LINKS``
-    **DEPRECATED**, use ``PROJECTROLES_HIDE_PROJECT_APPS`` instead. This will be
-    removed in v1.0
 ``PROJECTROLES_DELEGATE_LIMIT``
     The number of delegate roles allowed per project. The amount is limited to 1
     per project if not set, unlimited if set to 0. Will be ignored for remote

diff --git a/docs/source/major_changes.rst b/docs/source/major_changes.rst
@@ -76,6 +76,12 @@ needs to use SAML on a SODAR Core based site, we are happy to review pull
 requests to re-introduce it. Please note the implementation has to support
 Django v4.2+.
 
+PROJECTROLES_HIDE_APP_LINKS Removed
+-----------------------------------
+
+The ``PROJECTROLES_HIDE_APP_LINKS`` Django setting, which was deprecated in
+v0.13, has been removed. Use ``PROJECTROLES_HIDE_PROJECT_APPS`` instead.
+
 
 v0.13.4 (2024-02-16)
 ********************

diff --git a/projectroles/templatetags/projectroles_tags.py b/projectroles/templatetags/projectroles_tags.py
@@ -89,9 +89,6 @@ def is_app_visible(plugin, project, user):
     app_hidden = False
     if plugin.name in getattr(settings, 'PROJECTROLES_HIDE_PROJECT_APPS', []):
         app_hidden = True
-    # TODO: Remove this in SODAR Core v1.0 (see issue #1143)
-    elif plugin.name in getattr(settings, 'PROJECTROLES_HIDE_APP_LINKS', []):
-        app_hidden = True
     if (
         can_view_app
         and not app_hidden

diff --git a/siteinfo/views.py b/siteinfo/views.py
@@ -64,7 +64,6 @@
     'PROJECTROLES_ENABLE_PROFILING',
     'PROJECTROLES_ENABLE_SEARCH',
     'PROJECTROLES_HELP_HIGHLIGHT_DAYS',
-    'PROJECTROLES_HIDE_APP_LINKS',  # TODO: Remove in v1.0 (see issue #1143)
     'PROJECTROLES_HIDE_PROJECT_APPS',
     'PROJECTROLES_INLINE_HEAD_INCLUDE',
     'PROJECTROLES_INVITE_EXPIRY_DAYS',