Django v3.2

DesignSafe-CI · Oct 6, 2023 · 6aeca39 · 6aeca39
1 parent 96b577f
commit 6aeca39
Show file tree

Hide file tree

Showing 44 changed files with 762 additions and 592 deletions.
diff --git a/conf/docker/Dockerfile b/conf/docker/Dockerfile
@@ -7,7 +7,7 @@ COPY . /designsafe/
 RUN npm run build
 
 
-FROM python:3.7-buster
+FROM python:3.8-buster
 
 LABEL MAINTAINER="DesignSafe-CI <[email protected]>"
 

diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/generating_user_report.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/generating_user_report.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block title %}Generating User Report{% endblock %}
 

diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/nees_migration.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/nees_migration.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block title %}Accessing DesignSafe{% endblock %}
 

diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/nees_migration_block.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/nees_migration_block.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="callout callout-default">
     <p class="lead">NEES Users: Accessing DesignSafe</p>
     <div style="display:flex;">

diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/nees_migration_step_1.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/nees_migration_step_1.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block title %}Create Account{% endblock %}
 

diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/nees_migration_step_2.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/nees_migration_step_2.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block title %}Create Account{% endblock %}
 

diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/profile_edit.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/profile_edit.html
@@ -1,6 +1,6 @@
 {% extends "designsafe/apps/accounts/base.html" %}
 
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block panel_content %}
 <div class="panel panel-default">

diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/register.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/register.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block title %}Register for a DesignSafe-CI/TACC Account{% endblock %}
 

diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/registration_successful.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/registration_successful.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block title %}Account Registration Received{% endblock %}
 

diff --git a/designsafe/apps/api/templates/designsafe/apps/api/agave/preview.html b/designsafe/apps/api/templates/designsafe/apps/api/agave/preview.html
@@ -1,4 +1,4 @@
-{% load staticfiles sekizai_tags %}
+{% load static sekizai_tags %}
 
 <!doctype html>
 <html lang="en-US">

diff --git a/designsafe/apps/api/templates/designsafe/apps/api/box/preview.html b/designsafe/apps/api/templates/designsafe/apps/api/box/preview.html
@@ -1,4 +1,4 @@
-{% load staticfiles sekizai_tags %}
+{% load static sekizai_tags %}
 
 <!doctype html>
 <html lang="en-US">

diff --git a/designsafe/apps/api/templates/designsafe/apps/api/data/agave/preview.html b/designsafe/apps/api/templates/designsafe/apps/api/data/agave/preview.html
@@ -1,4 +1,4 @@
-{% load staticfiles sekizai_tags %}
+{% load static sekizai_tags %}
 
 <!doctype html>
 <html lang="en-US">

diff --git a/designsafe/apps/applications/templates/designsafe/apps/applications/denied.html b/designsafe/apps/applications/templates/designsafe/apps/applications/denied.html
@@ -1,5 +1,5 @@
 {% extends "base_angular.html" %}
-{% load cms_tags staticfiles sekizai_tags%}
+{% load cms_tags static sekizai_tags%}
 {% block title %}Applications{% endblock %}
 {% block content %}
 

diff --git a/designsafe/apps/applications/templates/designsafe/apps/applications/index.j2 b/designsafe/apps/applications/templates/designsafe/apps/applications/index.j2
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load cms_tags staticfiles sekizai_tags%}
+{% load cms_tags static sekizai_tags%}
 {% block title %}Applications{% endblock %}
 {% block content %}
 

diff --git a/designsafe/apps/auth/templates/designsafe/apps/auth/agave_session_error.html b/designsafe/apps/auth/templates/designsafe/apps/auth/agave_session_error.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags %}
+{% load static sekizai_tags %}
 {% block title %}Agave Session Error{% endblock %}
 
 {% block content %}

diff --git a/designsafe/apps/auth/templates/designsafe/apps/auth/logged_out.html b/designsafe/apps/auth/templates/designsafe/apps/auth/logged_out.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags %}
+{% load static sekizai_tags %}
 {% block title %}Logged Out{% endblock %}
 
 {% block content %}

diff --git a/designsafe/apps/auth/templates/designsafe/apps/auth/login.html b/designsafe/apps/auth/templates/designsafe/apps/auth/login.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags %}
+{% load static sekizai_tags %}
 {% block title %}Log in to DesignSafe-CI{% endblock %}
 
 {% block content %}

diff --git a/designsafe/apps/dashboard/templates/designsafe/apps/dashboard/index.j2 b/designsafe/apps/dashboard/templates/designsafe/apps/dashboard/index.j2
@@ -1,6 +1,6 @@
 {% extends "base_angular.html" %}
 
-{% load  sekizai_tags staticfiles %}
+{% load  sekizai_tags static %}
 
 {% block title %}{{title}}{% endblock %}
 

diff --git a/designsafe/apps/data/management/commands/es_setup.py b/designsafe/apps/data/management/commands/es_setup.py
@@ -1,6 +1,6 @@
 import logging
 from django.core.management import BaseCommand, CommandError
-from django.utils.six.moves import input
+from six.moves import input
 from django.conf import settings
 import elasticsearch
 import getpass

diff --git a/designsafe/apps/data/templates/data/data_depot.j2 b/designsafe/apps/data/templates/data/data_depot.j2
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load cms_tags staticfiles sekizai_tags%}
+{% load cms_tags static sekizai_tags%}
 
 {% block google_citation_meta %}
     <!--data/data_depot.html-->

diff --git a/designsafe/apps/djangoRT/templates/djangoRT/ticketDetail.html b/designsafe/apps/djangoRT/templates/djangoRT/ticketDetail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags tz %}
+{% load static sekizai_tags tz %}
 {% block title %}Ticket #{{ ticket_id }}{% endblock %}
 
 {% block breadcrumb %}

diff --git a/designsafe/apps/djangoRT/templates/djangoRT/ticketList.html b/designsafe/apps/djangoRT/templates/djangoRT/ticketList.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles sekizai_tags tz %}
+{% load static sekizai_tags tz %}
 {% block title %}My Tickets{% endblock %}
 
 {% block breadcrumb %}

diff --git a/designsafe/apps/nco/templates/designsafe/apps/nco/nco_index.j2 b/designsafe/apps/nco/templates/designsafe/apps/nco/nco_index.j2
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load cms_tags staticfiles sekizai_tags%}
+{% load cms_tags static sekizai_tags%}
 
 {% block title %}
 NHERI Facilities Scheduling Dashbaord

diff --git a/designsafe/apps/nco/templates/designsafe/apps/nco/ttc_grants.j2 b/designsafe/apps/nco/templates/designsafe/apps/nco/ttc_grants.j2
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load cms_tags staticfiles sekizai_tags%}
+{% load cms_tags static sekizai_tags%}
 
 {% block title %}
 NHERI Facilities Scheduling Dashbaord

diff --git a/designsafe/apps/rapid/migrations/0002_auto_20170627_2004.py b/designsafe/apps/rapid/migrations/0002_auto_20170627_2004.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('rapid', '0001_initial'),
+        ('designsafe_rapid', '0001_initial'),
     ]
 
     operations = [

diff --git a/designsafe/apps/rapid/migrations/0003_auto_20170724_2110.py b/designsafe/apps/rapid/migrations/0003_auto_20170724_2110.py
@@ -11,7 +11,7 @@ def add_group(apps, scema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('rapid', '0002_auto_20170627_2004'),
+        ('designsafe_rapid', '0002_auto_20170627_2004'),
     ]
 
     operations = [

diff --git a/designsafe/apps/rapid/templates/designsafe/apps/rapid/admin_create_event.html b/designsafe/apps/rapid/templates/designsafe/apps/rapid/admin_create_event.html
@@ -1,6 +1,6 @@
 {% extends "designsafe/apps/rapid/rapid_base.html" %}
 {% load ds_filters %}
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 
 {% block main %}

diff --git a/designsafe/apps/rapid/templates/designsafe/apps/rapid/admin_edit_event.html b/designsafe/apps/rapid/templates/designsafe/apps/rapid/admin_edit_event.html
@@ -1,6 +1,6 @@
 {% extends "designsafe/apps/rapid/rapid_base.html" %}
 {% load ds_filters %}
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 
 

diff --git a/designsafe/apps/rapid/templates/designsafe/apps/rapid/admin_event_add_dataset.html b/designsafe/apps/rapid/templates/designsafe/apps/rapid/admin_event_add_dataset.html
@@ -1,6 +1,6 @@
 {% extends "designsafe/apps/rapid/rapid_base.html" %}
 {% load ds_filters %}
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block main %}
 

diff --git a/designsafe/apps/rapid/templates/designsafe/apps/rapid/admin_event_edit_dataset.html b/designsafe/apps/rapid/templates/designsafe/apps/rapid/admin_event_edit_dataset.html
@@ -1,6 +1,6 @@
 {% extends "designsafe/apps/rapid/rapid_base.html" %}
 {% load ds_filters %}
-{% load bootstrap3 sekizai_tags staticfiles %}
+{% load bootstrap3 sekizai_tags static %}
 
 {% block main %}
 

diff --git a/designsafe/apps/workspace/templates/designsafe/apps/workspace/index.j2 b/designsafe/apps/workspace/templates/designsafe/apps/workspace/index.j2
@@ -1,5 +1,5 @@
 {% extends "base_angular.html" %}
-{% load cms_tags staticfiles sekizai_tags%}
+{% load cms_tags static sekizai_tags%}
 {% block title %}Tools & Applications{% endblock %}
 {% block content %}
 

diff --git a/designsafe/settings/common_settings.py b/designsafe/settings/common_settings.py
@@ -213,6 +213,7 @@
         }
     }
 
+X_FRAME_OPTIONS = "SAMEORIGIN"
 
 HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter', ]
 ALDRYN_SEARCH_DEFAULT_LANGUAGE = 'en'

diff --git a/designsafe/templates/base.j2 b/designsafe/templates/base.j2
@@ -1,4 +1,4 @@
-{% load cms_tags staticfiles sekizai_tags menu_tags recaptcha2 %}
+{% load cms_tags static sekizai_tags menu_tags recaptcha2 %}
 <!DOCTYPE html>
 <html lang="en-US">
   <head>

diff --git a/designsafe/templates/base_angular.html b/designsafe/templates/base_angular.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load cms_tags staticfiles sekizai_tags%}
+{% load cms_tags static sekizai_tags%}
 
 {% block scripts %}
 {% endblock %}
diff --git a/designsafe/templates/cms_homepage.html b/designsafe/templates/cms_homepage.html
@@ -1,4 +1,4 @@
-{% load cms_tags staticfiles sekizai_tags menu_tags%}
+{% load cms_tags static sekizai_tags menu_tags%}
 <!DOCTYPE html>
 <html lang="en-US">
   <head>

diff --git a/designsafe/templates/cms_page.html b/designsafe/templates/cms_page.html
@@ -1,4 +1,4 @@
 {% extends "base.html" %}
-{% load cms_tags staticfiles sekizai_tags menu_tags %}
+{% load cms_tags static sekizai_tags menu_tags %}
 {% block content %}{% placeholder "content" %}{% endblock content %}
 {% block footer %}{% include 'includes/footer.html' %}{% endblock footer %}
diff --git a/designsafe/templates/cms_page_no_footer.html b/designsafe/templates/cms_page_no_footer.html
@@ -1,3 +1,3 @@
 {% extends "base.html" %}
-{% load cms_tags staticfiles sekizai_tags menu_tags %}
+{% load cms_tags static sekizai_tags menu_tags %}
 {% block content %}{% placeholder "content" %}{% endblock content %}
diff --git a/designsafe/templates/djangocms_forms/form_template/default.html b/designsafe/templates/djangocms_forms/form_template/default.html
@@ -1,4 +1,4 @@
-{% load cms_tags  djangocms_forms_tags i18n sekizai_tags staticfiles %}
+{% load cms_tags  djangocms_forms_tags i18n sekizai_tags static %}
 <div class="forms" id="{{ instance.form_id }}">
   {% if instance.title %}
     <h3 class="title">{{ instance.title }}</h3>

diff --git a/designsafe/templates/ef_base.html b/designsafe/templates/ef_base.html
@@ -1,4 +1,4 @@
-{% load cms_tags staticfiles sekizai_tags menu_tags%}
+{% load cms_tags static sekizai_tags menu_tags%}
 <!DOCTYPE html>
 <html lang="en-US">
 

diff --git a/designsafe/templates/ef_cms_page.html b/designsafe/templates/ef_cms_page.html
@@ -1,4 +1,4 @@
-{% load cms_tags staticfiles sekizai_tags menu_tags%}
+{% load cms_tags static sekizai_tags menu_tags%}
 <!DOCTYPE html>
 <html lang="en-US">
   <head>

diff --git a/designsafe/templates/includes/header.html b/designsafe/templates/includes/header.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load static %}
 {% load auth_extras %}
 {% include 'includes/branding.html' %}

diff --git a/designsafe/templates/termsandconditions/tc_accept_terms.html b/designsafe/templates/termsandconditions/tc_accept_terms.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}{% trans 'Accept Terms and Conditions' %}{% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -213,6 +213,7 @@ @@
             }
         }
+    X_FRAME_OPTIONS = "SAMEORIGIN"
     HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter', ]
     ALDRYN_SEARCH_DEFAULT_LANGUAGE = 'en'
@@ Expand Down @@