From 279fa268407f56516b1d0f52b483f60cd02a5cf9 Mon Sep 17 00:00:00 2001 From: Anna Grund Date: Wed, 27 Sep 2023 22:36:15 +0300 Subject: [PATCH] [AJP-2] --- .../0025_photomodelsuggestionconfirmreject.py | 30 ------------------ .../0026_photomodelsuggestionresult.py | 28 ----------------- ...ove_photomodelsuggestionresult_proposer.py | 17 ---------- .../migrations/0028_auto_20230525_1916.py | 31 ------------------- .../0029_photomodelsuggestionresult.py | 27 ---------------- ...tionalternativecategory_unique_together.py | 17 ---------- .../migrations/0031_auto_20230809_1940.py | 21 ------------- ...odelsuggestionalternativecategory_table.py | 17 ---------- .../migrations/0033_auto_20230809_1944.py | 21 ------------- ...tionalternativecategory_unique_together.py | 17 ---------- ajapaik/ajapaik/views.py | 6 ++-- ajapaik/settings/default.py | 8 ++--- 12 files changed, 6 insertions(+), 234 deletions(-) delete mode 100644 ajapaik/ajapaik/migrations/0025_photomodelsuggestionconfirmreject.py delete mode 100644 ajapaik/ajapaik/migrations/0026_photomodelsuggestionresult.py delete mode 100644 ajapaik/ajapaik/migrations/0027_remove_photomodelsuggestionresult_proposer.py delete mode 100644 ajapaik/ajapaik/migrations/0028_auto_20230525_1916.py delete mode 100644 ajapaik/ajapaik/migrations/0029_photomodelsuggestionresult.py delete mode 100644 ajapaik/ajapaik/migrations/0030_alter_photomodelsuggestionalternativecategory_unique_together.py delete mode 100644 ajapaik/ajapaik/migrations/0031_auto_20230809_1940.py delete mode 100644 ajapaik/ajapaik/migrations/0032_alter_photomodelsuggestionalternativecategory_table.py delete mode 100644 ajapaik/ajapaik/migrations/0033_auto_20230809_1944.py delete mode 100644 ajapaik/ajapaik/migrations/0034_alter_photomodelsuggestionalternativecategory_unique_together.py diff --git a/ajapaik/ajapaik/migrations/0025_photomodelsuggestionconfirmreject.py b/ajapaik/ajapaik/migrations/0025_photomodelsuggestionconfirmreject.py deleted file mode 100644 index 77fb691b6..000000000 --- a/ajapaik/ajapaik/migrations/0025_photomodelsuggestionconfirmreject.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 3.2.7 on 2023-03-19 20:17 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0024_auto_20230204_1918'), - ] - - operations = [ - migrations.CreateModel( - name='PhotoModelSuggestionConfirmReject', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(auto_now_add=True, db_index=True)), - ('viewpoint_elevation_to_confirm', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Ground'), (1, 'Raised'), (2, 'Aerial')], null=True, verbose_name='Viewpoint elevation')), - ('scene_to_confirm', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Interior'), (1, 'Exterior')], null=True, verbose_name='Scene')), - ('viewpoint_elevation_to_reject', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Ground'), (1, 'Raised'), (2, 'Aerial')], null=True, verbose_name='Viewpoint elevation')), - ('scene_to_reject', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Interior'), (1, 'Exterior')], null=True, verbose_name='Scene')), - ('photo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ajapaik.photo')), - ('proposer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photo_scene_suggestions_confirmation', to='ajapaik.profile')), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/ajapaik/ajapaik/migrations/0026_photomodelsuggestionresult.py b/ajapaik/ajapaik/migrations/0026_photomodelsuggestionresult.py deleted file mode 100644 index 396832f45..000000000 --- a/ajapaik/ajapaik/migrations/0026_photomodelsuggestionresult.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.2.7 on 2023-04-29 15:38 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0025_photomodelsuggestionconfirmreject'), - ] - - operations = [ - migrations.CreateModel( - name='PhotoModelSuggestionResult', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(auto_now_add=True, db_index=True)), - ('viewpoint_elevation', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Ground'), (1, 'Raised'), (2, 'Aerial')], null=True, verbose_name='Viewpoint elevation')), - ('scene', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Interior'), (1, 'Exterior')], null=True, verbose_name='Scene')), - ('photo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ajapaik.photo')), - ('proposer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photo_scene_suggestions_result', to='ajapaik.profile')), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/ajapaik/ajapaik/migrations/0027_remove_photomodelsuggestionresult_proposer.py b/ajapaik/ajapaik/migrations/0027_remove_photomodelsuggestionresult_proposer.py deleted file mode 100644 index 2fb740628..000000000 --- a/ajapaik/ajapaik/migrations/0027_remove_photomodelsuggestionresult_proposer.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.7 on 2023-04-29 16:22 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0026_photomodelsuggestionresult'), - ] - - operations = [ - migrations.RemoveField( - model_name='photomodelsuggestionresult', - name='proposer', - ), - ] diff --git a/ajapaik/ajapaik/migrations/0028_auto_20230525_1916.py b/ajapaik/ajapaik/migrations/0028_auto_20230525_1916.py deleted file mode 100644 index d09d084f3..000000000 --- a/ajapaik/ajapaik/migrations/0028_auto_20230525_1916.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 3.2.7 on 2023-05-25 16:16 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0027_remove_photomodelsuggestionresult_proposer'), - ] - - operations = [ - migrations.CreateModel( - name='PhotoModelSuggestionAlternativeCategory', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(auto_now_add=True, db_index=True)), - ('viewpoint_elevation_alternation', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Ground'), (1, 'Raised'), (2, 'Aerial')], null=True, verbose_name='Viewpoint elevation')), - ('scene_alternation', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Interior'), (1, 'Exterior')], null=True, verbose_name='Scene')), - ('photo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ajapaik.photo')), - ('proposer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photo_scene_suggestions_alternation', to='ajapaik.profile')), - ], - options={ - 'abstract': False, - }, - ), - migrations.DeleteModel( - name='PhotoModelSuggestionResult', - ), - ] diff --git a/ajapaik/ajapaik/migrations/0029_photomodelsuggestionresult.py b/ajapaik/ajapaik/migrations/0029_photomodelsuggestionresult.py deleted file mode 100644 index a718b0506..000000000 --- a/ajapaik/ajapaik/migrations/0029_photomodelsuggestionresult.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 3.2.7 on 2023-05-25 16:21 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0028_auto_20230525_1916'), - ] - - operations = [ - migrations.CreateModel( - name='PhotoModelSuggestionResult', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(auto_now_add=True, db_index=True)), - ('viewpoint_elevation', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Ground'), (1, 'Raised'), (2, 'Aerial')], null=True, verbose_name='Viewpoint elevation')), - ('scene', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Interior'), (1, 'Exterior')], null=True, verbose_name='Scene')), - ('photo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ajapaik.photo')), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/ajapaik/ajapaik/migrations/0030_alter_photomodelsuggestionalternativecategory_unique_together.py b/ajapaik/ajapaik/migrations/0030_alter_photomodelsuggestionalternativecategory_unique_together.py deleted file mode 100644 index dafe318cc..000000000 --- a/ajapaik/ajapaik/migrations/0030_alter_photomodelsuggestionalternativecategory_unique_together.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.7 on 2023-08-09 16:34 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0029_photomodelsuggestionresult'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='photomodelsuggestionalternativecategory', - unique_together={('proposer', 'photo_id', 'viewpoint_elevation_alternation', 'scene_alternation')}, - ), - ] diff --git a/ajapaik/ajapaik/migrations/0031_auto_20230809_1940.py b/ajapaik/ajapaik/migrations/0031_auto_20230809_1940.py deleted file mode 100644 index 538e35c5b..000000000 --- a/ajapaik/ajapaik/migrations/0031_auto_20230809_1940.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.2.7 on 2023-08-09 16:40 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0030_alter_photomodelsuggestionalternativecategory_unique_together'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='photomodelsuggestionalternativecategory', - unique_together={('proposer', 'photo_id')}, - ), - migrations.AlterModelTable( - name='photomodelsuggestionalternativecategory', - table='ajapaik_photomodelsuggestionalternativecategory', - ), - ] diff --git a/ajapaik/ajapaik/migrations/0032_alter_photomodelsuggestionalternativecategory_table.py b/ajapaik/ajapaik/migrations/0032_alter_photomodelsuggestionalternativecategory_table.py deleted file mode 100644 index f15fdf450..000000000 --- a/ajapaik/ajapaik/migrations/0032_alter_photomodelsuggestionalternativecategory_table.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.7 on 2023-08-09 16:41 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0031_auto_20230809_1940'), - ] - - operations = [ - migrations.AlterModelTable( - name='photomodelsuggestionalternativecategory', - table='photomodelsuggestionalternativecategory', - ), - ] diff --git a/ajapaik/ajapaik/migrations/0033_auto_20230809_1944.py b/ajapaik/ajapaik/migrations/0033_auto_20230809_1944.py deleted file mode 100644 index 6d7fb49ae..000000000 --- a/ajapaik/ajapaik/migrations/0033_auto_20230809_1944.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.2.7 on 2023-08-09 16:44 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0032_alter_photomodelsuggestionalternativecategory_table'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='photomodelsuggestionalternativecategory', - unique_together={('proposer', 'photo_id', 'scene_alternation')}, - ), - migrations.AlterModelTable( - name='photomodelsuggestionalternativecategory', - table='ajapaik_photomodelsuggestionalternativecategory', - ), - ] diff --git a/ajapaik/ajapaik/migrations/0034_alter_photomodelsuggestionalternativecategory_unique_together.py b/ajapaik/ajapaik/migrations/0034_alter_photomodelsuggestionalternativecategory_unique_together.py deleted file mode 100644 index 48e75c554..000000000 --- a/ajapaik/ajapaik/migrations/0034_alter_photomodelsuggestionalternativecategory_unique_together.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.7 on 2023-08-09 17:13 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('ajapaik', '0033_auto_20230809_1944'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='photomodelsuggestionalternativecategory', - unique_together={('proposer', 'photo_id', 'viewpoint_elevation_alternation'), ('proposer', 'photo_id', 'scene_alternation')}, - ), - ] diff --git a/ajapaik/ajapaik/views.py b/ajapaik/ajapaik/views.py index f1903711c..91b80d10a 100644 --- 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 index 68d97f9ac..6c745e83c 100644 --- 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'