Remove links from projekt sidebar if tasks/views not available

rdmo/core/settings.py

@@ -212,7 +212,8 @@
     'projects': [
         'projects-table',
         'create-project',
-        'import-project'
+        'import-project',
+        'support-info'
     ],
     'project': [
         'project-questions',
@@ -222,11 +223,13 @@
         'project-memberships',
         'project-snapshots',
         'export-project',
-        'import-project'
+        'import-project',
+        'support-info'
     ],
     'issue_send': [
         'issue-message',
-        'issue-attachments'
+        'issue-attachments',
+        'support-info'
     ]
 }
 

rdmo/overlays/static/overlays/js/overlays.js

@@ -23,6 +23,12 @@ function initOverlays(url_name) {
                 'content': $(overlayId).html(),
             })
 
+            // if overlay element does not exist, proceed with next overlay
+            if (!$(elementId).length) {
+                fetchResponse('next');
+                return;
+            }
+
             // show popover
             $(elementId).popover(opts).popover('show');
 

rdmo/overlays/viewsets.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib.sites.models import Site
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound
@@ -6,15 +7,15 @@
 from rest_framework.viewsets import ViewSet
 
 from .models import Overlay
-from .utils import get_overlays
 
 
 class OverlayViewSet(ViewSet):
 
     @action(detail=False, methods=['post'], url_path='(?P<url_name>[-\\w]+)/current', permission_classes=[IsAuthenticated])
     def current(self, request, url_name=None):
         site = Site.objects.get_current()
-        overlays = get_overlays(url_name)
+        overlays = settings.OVERLAYS.get(url_name)[:]
+
         if not overlays:
             raise NotFound()
 
@@ -31,7 +32,7 @@ def current(self, request, url_name=None):
     @action(detail=False, methods=['post'], url_path='(?P<url_name>[-\\w]+)/next', permission_classes=[IsAuthenticated])
     def next(self, request, url_name=None):
         site = Site.objects.get_current()
-        overlays = get_overlays(url_name)
+        overlays = settings.OVERLAYS.get(url_name)[:]
         if not overlays:
             raise NotFound()
 
@@ -53,7 +54,7 @@ def next(self, request, url_name=None):
     @action(detail=False, methods=['post'], url_path='(?P<url_name>[-\\w]+)/dismiss', permission_classes=[IsAuthenticated])
     def dismiss(self, request, url_name=None):
         site = Site.objects.get_current()
-        overlays = get_overlays(url_name)
+        overlays = settings.OVERLAYS.get(url_name)[:]
         if not overlays:
             raise NotFound()
 

rdmo/projects/templates/projects/issue_send.html

@@ -50,5 +50,6 @@ <h1>{% trans 'Send task' %}</h1>
 
 {% render_lang_template 'projects/overlays/issue_send_issue_message' %}
 {% render_lang_template 'projects/overlays/issue_send_issue_attachments' %}
+{% render_lang_template 'projects/overlays/issue_send_support-info' %}
 
 {% endblock %}

rdmo/projects/templates/projects/issue_send_sidebar.html

@@ -7,3 +7,5 @@ <h2 id="issue-attachments">{% trans 'Attachments' %}</h2>
 {% include 'core/bootstrap_form_field.html' with field=form.attachments_files %}
 {% include 'core/bootstrap_form_field.html' with field=form.attachments_snapshot %}
 {% include 'core/bootstrap_form_field.html' with field=form.attachments_format %}
+
+<div id="support-info"></div>

rdmo/projects/templates/projects/overlays/issue_send_support-info_de.html

@@ -0,0 +1,8 @@
+<div class="overlay" id="support-info-overlay"
+    data-title="Unterstützung"
+    data-placement="left auto">
+
+    Falls Sie weitere Fragen haben, wenden Sie sich gern an Ihre lokalen Ansprechpartner:innen zum Thema Forschungsdaten.
+
+    {% include 'overlays/buttons.html'%}
+</div>

rdmo/projects/templates/projects/overlays/issue_send_support-info_en.html

@@ -0,0 +1,8 @@
+<div class="overlay" id="support-info-overlay"
+    data-title="Support"
+    data-placement="left auto">
+
+    If you have further questions, please do not hesitate to ask your local contact person for research data management.
+
+    {% include 'overlays/buttons.html'%}
+</div>

rdmo/projects/templates/projects/overlays/project_support-info_de.html

@@ -0,0 +1,8 @@
+<div class="overlay" id="support-info-overlay"
+    data-title="Unterstützung"
+    data-placement="left auto">
+
+    Falls Sie weitere Fragen haben, wenden Sie sich gern an Ihre lokalen Ansprechpartner:innen zum Thema Forschungsdaten.
+
+    {% include 'overlays/buttons.html'%}
+</div>

rdmo/projects/templates/projects/overlays/project_support-info_en.html

@@ -0,0 +1,8 @@
+<div class="overlay" id="support-info-overlay"
+    data-title="Support"
+    data-placement="left auto">
+
+    If you have further questions, please do not hesitate to ask your local contact person for research data management.
+
+    {% include 'overlays/buttons.html'%}
+</div>

rdmo/projects/templates/projects/overlays/projects_support-info_de.html

@@ -0,0 +1,8 @@
+<div class="overlay" id="support-info-overlay"
+    data-title="Unterstützung"
+    data-placement="left auto">
+
+    Falls Sie weitere Fragen haben, wenden Sie sich gern an Ihre lokalen Ansprechpartner:innen zum Thema Forschungsdaten.
+
+    {% include 'overlays/buttons.html'%}
+</div>

rdmo/projects/templates/projects/overlays/projects_support-info_en.html

@@ -0,0 +1,8 @@
+<div class="overlay" id="support-info-overlay"
+    data-title="Support"
+    data-placement="left auto">
+
+    If you have further questions, please do not hesitate to ask your local contact person for research data management.
+
+    {% include 'overlays/buttons.html'%}
+</div>

rdmo/projects/templates/projects/project_detail.html

@@ -44,5 +44,7 @@
     {% render_lang_template 'projects/overlays/project_project_snapshots' %}
     {% render_lang_template 'projects/overlays/project_export_project' %}
     {% render_lang_template 'projects/overlays/project_import_project' %}
+    {% render_lang_template 'projects/overlays/project_support-info' %}
+
 
 {% endblock %}

rdmo/projects/templates/projects/project_detail_sidebar.html

@@ -52,12 +52,12 @@ <h2>{% trans 'Options' %}</h2>
         <a href="{% url 'project_update_parent' project.pk %}">{% trans 'Update parent project' %}</a>
     </li>
     {% endif %}
-    {% if settings.PROJECT_ISSUES %}
+    {% if settings.PROJECT_ISSUES and tasks_available %}
     <li>
         <a href="{% url 'project_update_tasks' project.pk %}">{% trans 'Update project tasks' %}</a>
     </li>
     {% endif %}
-    {% if settings.PROJECT_VIEWS %}
+    {% if settings.PROJECT_VIEWS and views_available %}
     <li>
         <a href="{% url 'project_update_views' project.pk %}">{% trans 'Update project views' %}</a>
     </li>
@@ -159,3 +159,5 @@ <h2 id="import-project">{% trans 'Import values' %}</h2>
     {% endif %}
 </ul>
 {% endif %}
+
+<div id="support-info"></div>

rdmo/projects/templates/projects/projects.html

@@ -107,6 +107,8 @@ <h2>{% trans 'Pending invitations' %}</h2>
     </p>
     {% endif %}
 
+    <div id="support-info"></div>
+
 {% endblock %}
 
 {% block page %}
@@ -158,4 +160,6 @@ <h1>{% trans 'My Projects' %}</h1>
     {% render_lang_template 'projects/overlays/projects_create_project' %}
     {% render_lang_template 'projects/overlays/projects_projects_table' %}
     {% render_lang_template 'projects/overlays/projects_import_project' %}
+    {% render_lang_template 'projects/overlays/projects_support-info' %}
+
 {% endblock %}