Merge branch 'development' into development-fix-5234

UtrechtUniversity · Jul 27, 2023 · 1a997bf · 1a997bf
2 parents 328288f + cec9dcd
commit 1a997bf
Show file tree

Hide file tree

Showing 41 changed files with 160 additions and 624 deletions.
diff --git a/api.py b/api.py
@@ -86,11 +86,8 @@ def nrep_string_expr(s: str, m: int = 64) -> str:
 
     if app.config.get('LOG_API_CALL_DURATION', False):
         endtime = timer()
-        callduration = round(endtime - begintime, 3)
-        print("API call {} with params {}: duration {} seconds".format(fn,
-                                                                       params,
-                                                                       str(callduration)),
-              file=sys.stderr)
+        callduration = round((endtime - begintime) * 1000)
+        print("DEBUG: {:4d}ms api_{} {}".format(callduration, fn, params), file=sys.stderr)
 
     return json.loads(result)
 

diff --git a/datarequest/templates/datarequest/index.html b/datarequest/templates/datarequest/index.html
@@ -3,8 +3,7 @@
 {% block title %}{{ super() }} &dash; Datarequests overview{% endblock title %}
 
 {% block style %}
-<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.css') }}">
-<link rel="stylesheet" href="{{ url_for('static', filename='lib/fontawesome-free-6.0.0/css/fontawesome.min.css') }}">
+<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.css') }}">
 <link rel="stylesheet" href="{{ url_for('datarequest_bp.static', filename='css/index.css') }}">
 {% endblock style %}
 
@@ -14,7 +13,7 @@
   dacrequests: '{{ dacrequests }}'
 }
 </script>
-<script src="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.js') }}"></script>
+<script src="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.js') }}"></script>
 <script src="{{ url_for('datarequest_bp.static', filename='js/index.js') }}"></script>
 {% endblock scripts %}
 

diff --git a/deposit/templates/deposit/data.html b/deposit/templates/deposit/data.html
@@ -3,7 +3,7 @@
 {% block title %}{{ super() }} &dash; Deposit &dash; Add data{% endblock title %}
 
 {% block style %}
-<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.css') }}">
+<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.css') }}">
 <link rel="stylesheet" href="{{ url_for('deposit_bp.static', filename='lib/stepper/bs-stepper.custom.css') }}">
 <link rel="stylesheet" href="{{ url_for('deposit_bp.static', filename='css/deposit.css') }}">
 {% endblock style %}
@@ -13,7 +13,7 @@
     var path = {{ path|tojson|safe }};
     var view = 'browse';
 </script>
-<script src="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.js') }}"></script>
+<script src="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.js') }}"></script>
 <script src="{{ url_for('deposit_bp.static', filename='lib/flow-js/flow.min.js') }}"></script>
 <script src="{{ url_for('deposit_bp.static', filename='lib/dragbetter-js/jquery.dragbetter.js') }}"></script>
 <script src="{{ url_for('deposit_bp.static', filename='js/data.js') }}"></script>

diff --git a/deposit/templates/deposit/overview.html b/deposit/templates/deposit/overview.html
@@ -3,7 +3,7 @@
 {% block title %}{{ super() }} &dash; Deposit &dash; My deposits{% endblock title %}
 
 {% block style %}
-<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.css') }}">
+<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.css') }}">
 <link rel="stylesheet" href="{{ url_for('deposit_bp.static', filename='css/overview.css') }}">
 {% endblock style %}
 
@@ -12,7 +12,7 @@
     var browseStartDir = dir = path = {{ path|tojson|safe }};
     var view = 'browse';
 </script>
-<script src="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.js') }}"></script>
+<script src="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.js') }}"></script>
 <script src="{{ url_for('deposit_bp.static', filename='js/overview.js') }}"></script>
 {% endblock scripts %}
 

diff --git a/general/templates/general/base.html b/general/templates/general/base.html
@@ -9,15 +9,15 @@
 
             <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.ico') }}">
 
-            <link rel="stylesheet" href="{{ url_for('static', filename='lib/fontawesome-free-6.0.0/css/fontawesome.min.css') }}">
-            <link rel="stylesheet" href="{{ url_for('static', filename='lib/fontawesome-free-6.0.0/css/all.min.css') }}">
+            <link rel="stylesheet" href="{{ url_for('static', filename='lib/fontawesome-free-6.4.0/css/fontawesome.min.css') }}">
+            <link rel="stylesheet" href="{{ url_for('static', filename='lib/fontawesome-free-6.4.0/css/all.min.css') }}">
             <link rel="stylesheet" href="{{ url_for('static', filename='css/yoda-portal.css') }}">
             {% block style %}{% endblock style %}
 
             <script src="{{ url_for('static', filename='lib/bootstrap-5.2.0/js/bootstrap.bundle.min.js') }}"></script>
             <script src="{{ url_for('static', filename='js/yoda.js') }}"></script>
             {% if g.user %}
-            <script src="{{ url_for('static', filename='lib/jquery-3.6.4/jquery-3.6.4.min.js') }}"></script>
+            <script src="{{ url_for('static', filename='lib/jquery-3.7.0/jquery-3.7.0.min.js') }}"></script>
             {% endif %}
             <script>
                 Yoda.csrf = {tokenName: 'csrf_token', tokenValue: '{{ csrf_token() }}'};

diff --git a/group_manager/templates/group_manager/index.html b/group_manager/templates/group_manager/index.html
@@ -9,7 +9,7 @@
 {% endblock style %}
 
 {% block scripts %}
-    <script src="{{ url_for('static', filename='lib/jquery-3.6.4/jquery-migrate-3.4.1.min.js') }}"></script>
+    <script src="{{ url_for('static', filename='lib/jquery-migrate-3.4.1/jquery-migrate-3.4.1.min.js') }}"></script>
     <script src="{{ url_for('group_manager_bp.static', filename='js/group_manager.js') }}"></script>
     <script src="{{ url_for('group_manager_bp.static', filename='lib/select2/select2.min.js') }}"></script>
     <script>

diff --git a/intake/templates/intake/intake.html b/intake/templates/intake/intake.html
@@ -11,7 +11,7 @@
 {% endblock style %}
 
 {% block scripts %}
-    <script src="{{ url_for('static', filename='lib/jquery-3.6.4/jquery-migrate-3.4.1.min.js') }}"></script>
+    <script src="{{ url_for('static', filename='lib/jquery-migrate-3.4.1/jquery-migrate-3.4.1.min.js') }}"></script>
     <script src="{{ url_for('intake_bp.static', filename='scripts/jquery.dataTables.min.js') }}"></script>
     <script src="{{ url_for('intake_bp.static', filename='scripts/dataTables.bootstrap.js') }}"></script>
     <script src="{{ url_for('intake_bp.static', filename='scripts/dataTables.bootstrapPagination-3.js') }}"></script>

diff --git a/research/templates/research/browse.html b/research/templates/research/browse.html
@@ -3,7 +3,7 @@
 {% block title %}{{ super() }} &dash; Research{% endblock title %}
 
 {% block scripts %}
-<script src="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.js') }}"></script>
+<script src="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.js') }}"></script>
 <script src="{{ url_for('research_bp.static', filename='lib/flow-js/flow.min.js') }}"></script>
 <script src="{{ url_for('research_bp.static', filename='js/research.js') }}"></script>
 <script src="{{ url_for('research_bp.static', filename='js/dlgFileBrowseOperations.js') }}"></script>
@@ -16,7 +16,7 @@
 
 {% block style %}
 <link rel="stylesheet" href="{{ url_for('research_bp.static', filename='css/research.css') }}">
-<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.css') }}">
+<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.css') }}">
 {% endblock style %}
 
 {% block content %}

diff --git a/search/templates/search/search.html b/search/templates/search/search.html
@@ -3,14 +3,14 @@
 {% block title %}{{ super() }} &dash; Search{% endblock title %}
 
 {% block scripts %}
-<script src="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.js') }}"></script>
+<script src="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.js') }}"></script>
 <script src="{{ url_for('search_bp.static', filename='js/revision.js') }}"></script>
 <script src="{{ url_for('search_bp.static', filename='js/search.js') }}"></script>
 {% endblock scripts %}
 
 {% block style %}
 <link rel="stylesheet" href="{{ url_for('search_bp.static', filename='css/search.css') }}">
-<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.11.2/datatables.min.css') }}">
+<link rel="stylesheet" href="{{ url_for('static', filename='lib/datatables-1.13.5/datatables.min.css') }}">
 {% endblock style %}
 
 {% block content %}

diff --git a/static/lib/datatables-1.11.2/datatables.min.css b/static/lib/datatables-1.11.2/datatables.min.css