[AJP-2]

Ajapaik · Sep 27, 2023 · 279fa26 · 279fa26
1 parent 32c447c
commit 279fa26
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 234 deletions.
diff --git a/ajapaik/ajapaik/migrations/0025_photomodelsuggestionconfirmreject.py b/ajapaik/ajapaik/migrations/0025_photomodelsuggestionconfirmreject.py
diff --git a/ajapaik/ajapaik/migrations/0026_photomodelsuggestionresult.py b/ajapaik/ajapaik/migrations/0026_photomodelsuggestionresult.py
diff --git a/ajapaik/ajapaik/migrations/0027_remove_photomodelsuggestionresult_proposer.py b/ajapaik/ajapaik/migrations/0027_remove_photomodelsuggestionresult_proposer.py
diff --git a/ajapaik/ajapaik/migrations/0028_auto_20230525_1916.py b/ajapaik/ajapaik/migrations/0028_auto_20230525_1916.py
diff --git a/ajapaik/ajapaik/migrations/0029_photomodelsuggestionresult.py b/ajapaik/ajapaik/migrations/0029_photomodelsuggestionresult.py
diff --git a/.../ajapaik/migrations/0030_alter_photomodelsuggestionalternativecategory_unique_together.py b/.../ajapaik/migrations/0030_alter_photomodelsuggestionalternativecategory_unique_together.py
diff --git a/ajapaik/ajapaik/migrations/0031_auto_20230809_1940.py b/ajapaik/ajapaik/migrations/0031_auto_20230809_1940.py
diff --git a/ajapaik/ajapaik/migrations/0032_alter_photomodelsuggestionalternativecategory_table.py b/ajapaik/ajapaik/migrations/0032_alter_photomodelsuggestionalternativecategory_table.py
diff --git a/ajapaik/ajapaik/migrations/0033_auto_20230809_1944.py b/ajapaik/ajapaik/migrations/0033_auto_20230809_1944.py
diff --git a/.../ajapaik/migrations/0034_alter_photomodelsuggestionalternativecategory_unique_together.py b/.../ajapaik/migrations/0034_alter_photomodelsuggestionalternativecategory_unique_together.py
diff --git a/ajapaik/ajapaik/views.py b/ajapaik/ajapaik/views.py
@@ -2422,7 +2422,7 @@ def curator_photo_upload_handler(request):
                                 licence=licence,
                                 external_id=muis_id,
                                 external_sub_id=muis_media_id,
-                                source_key=source_key,
+                                source_key=upload_form.cleaned_data['identifyingNumber'],
                                 source_url=upload_form.cleaned_data['urlToRecord'],
                                 flip=upload_form.cleaned_data['flip'],
                                 invert=upload_form.cleaned_data['invert'],
@@ -2785,8 +2785,6 @@ def del_evenReadonly(action, name, exc):
 
         existing_photos = Photo.objects.filter(image__in=file_list).values_list('image', flat=True)
 
-        import_blacklist_service = ImportBlacklistService()
-
         # TODO: map over row fields instead to directly set attributes of photo with setattr
         # before doing so remove any exceptions like album, source, licence or start using only ids
         for row in csv.DictReader(decoded_file, delimiter=',', quotechar='"'):
@@ -2870,7 +2868,7 @@ def del_evenReadonly(action, name, exc):
                     lon=lon,
                     geography=geography,
                     source=source,
-                    source_key=upload_form.cleaned_data['identifyingNumber'],
+                    source_key=source_key,
                     source_url=source_url,
                     date_text=date_text,
                     licence=licence,

diff --git a/ajapaik/settings/default.py b/ajapaik/settings/default.py
@@ -104,7 +104,7 @@
 SECRET_KEY = '!!! paste your own secret key here !!!'
 
 MIDDLEWARE = [
-    # 'corsheaders.middleware.CorsMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
     'django_hosts.middleware.HostsRequestMiddleware',
     'django.middleware.gzip.GZipMiddleware',
     'django.middleware.security.SecurityMiddleware',
@@ -199,7 +199,7 @@
     'ajapaik.ajapaik_object_recognition',
     'ajapaik.ajapaik_object_categorization',
     'django_user_agents',
-    # 'corsheaders',
+    'corsheaders',
 
     # Django allauth and related applications.
     'allauth',
@@ -211,7 +211,7 @@
 )
 
 # Note: Allauth login's next-parameter redirection doesn't understand wildcards in ALLOWED_HOSTS.
-ALLOWED_HOSTS = ['.ajapaik.ee', '127.0.0.1', '0.0.0.0']
+ALLOWED_HOSTS = ['.ajapaik.ee', '127.0.0.1']
 
 # Allow CORS from localhost for developing
 CORS_ALLOWED_ORIGIN_REGEXES = [
@@ -399,7 +399,7 @@
 ACCOUNT_AUTHENTICATION_METHOD = 'email'
 ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_UNIQUE_EMAIL = True
-ACCOUNT_EMAIL_VERIFICATION = 'none'
+ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
 ACCOUNT_USERNAME_REQUIRED = False
 ACCOUNT_AUTHENTICATED_LOGIN_REDIRECTS = False
 SOCIALACCOUNT_EMAIL_VERIFICATION = 'none'