doing what git wants

Author: ropelews

bil_site/settings.py

@@ -85,6 +85,8 @@
     'django_filters',
     'bootstrap4',
     'django_pam',
+    'hijack',
+    'hijack.contrib.admin',
     #'core',
 ]
 
@@ -96,6 +98,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'hijack.middleware.HijackUserMiddleware',
 ]
 
 ROOT_URLCONF = 'bil_site.urls'

bil_site/urls.py

@@ -25,4 +25,5 @@
     path('admin/', admin.site.urls),
     path('accounts/', include('django.contrib.auth.urls')),
     path('', RedirectView.as_view(url='/ingest/')),
+    path('hijack/', include('hijack.urls')),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

ingest/templates/ingest/index.html

@@ -3,8 +3,8 @@
 {% block content %}
 
 <div class="container-fluid white_on_gray">
-  <div class="row">
 
+  <div class="row">
     <div class="col-lg-12 big-row-text">
       <h1>Data Submission Portal</h1>
       <p>The Brain Image Library (BIL) is a public resource enabling
@@ -19,8 +19,14 @@ <h1>Data Submission Portal</h1>
     </div>
 
   </div>
+  {% for message in messages %}
+  <div style="width: px; margin-left:0px; " class="alert alert-{{ message.tags }} " id="msg" role="alert">
+  {{ message }}
+    
+{% endfor %}
 </div>
 
+
 {% if request.user.username %}
 
 <div class="container-fluid gray_on_med_blue">

ingest/views.py

@@ -479,8 +479,12 @@ def collection_send(request):
 @login_required
 def collection_create(request):
     current_user = request.user
-    people = People.objects.get(auth_user_id_id = current_user.id)
-    project_person = ProjectPeople.objects.filter(people_id = people.id).all()
+    try:
+        people = People.objects.get(auth_user_id_id = current_user.id)
+        project_person = ProjectPeople.objects.filter(people_id = people.id).all()
+    except ObjectDoesNotExist:
+        messages.info(request, 'Error: Your account is likely not fully set up. Follow along with your Sign Up ticket on bil-support and provide the appropriate Grant Name and Number to the Project you will be submitting for. If you have already done so, kindly nudge us to complete your account creation.')
+        return redirect('/')
     for attribute in project_person:
         if attribute.is_pi:
             pi = True
@@ -2194,8 +2198,12 @@ def check_all_sheets(filename):
 @login_required
 def descriptive_metadata_upload(request):
     current_user = request.user
-    people = People.objects.get(auth_user_id_id = current_user.id)
-    project_person = ProjectPeople.objects.filter(people_id = people.id).all()
+    try:
+        people = People.objects.get(auth_user_id_id = current_user.id)
+        project_person = ProjectPeople.objects.filter(people_id = people.id).all()
+    except: 
+        messages.info(request, 'Error: Your account is likely not fully set up. Follow along with your Sign Up ticket on bil-support and provide the appropriate Grant Name and Number to the Project you will be submitting for. If you have already done so, kindly nudge us to complete your account creation.')
+        return redirect('/')
     for attribute in project_person:
         if attribute.is_pi:
             pi = True

requirements.txt

@@ -1,7 +1,6 @@
 amqp==5.0.9
-asgiref==3.3.2
+asgiref==3.5.2
 asn1crypto==0.24.0
-#backports.zoneinfo==0.2.1
 bcrypt==3.1.4
 beautifulsoup4==4.9.3
 billiard==3.6.4.0
@@ -12,10 +11,11 @@ click-didyoumean==0.3.0
 click-plugins==1.1.1
 click-repl==0.2.0
 cryptography==3.3.2
-Django==3.2.13
+Django==3.2.18
 django-bootstrap4==2.3.1
 django-celery-results==2.0.0
 django-filter==2.4.0
+django-hijack==3.2.6
 django-pam==2.0.0
 django-tables2==2.3.4
 et-xmlfile==1.0.1
@@ -48,9 +48,9 @@ six==1.11.0
 soupsieve==2.2.1
 sqlparse==0.4.2
 texttable==1.2.1
+tzdata==2022.1
 vine==5.0.0
 wcwidth==0.2.5
 xlrd==1.2.0
 xlwt==1.3.0
 zipp==3.4.1
-tzdata==2022.1