paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 03:56:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicting migrations

Browse Source
This commit is contained in:
Michael Shamoon
2022-07-02 16:55:52 -07:00
parent 92dd70098c
commit 2db0854eef
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/documents/migrations/1021_paperlesstask.py → src/documents/migrations/1022_paperlesstask.py
View File

@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
("django_q", "0014_schedule_cluster"), ("django_q", "0014_schedule_cluster"),
("documents", "1020_merge_20220518_1839"), ("documents", "1021_webp_thumbnail_conversion"),
] ]
operations = [ operations = [

2
src/documents/serialisers.py
View File

@@ -649,7 +649,7 @@ class AcknowledgeTasksViewSerializer(serializers.Serializer):
count = PaperlessTask.objects.filter(id__in=tasks).count() count = PaperlessTask.objects.filter(id__in=tasks).count()
if not count == len(tasks): if not count == len(tasks):
raise serializers.ValidationError( raise serializers.ValidationError(
f"Some tasks in {name} don't exist or were " f"specified twice.", f"Some tasks in {name} don't exist or were specified twice.",
) )
def validate_tasks(self, tasks): def validate_tasks(self, tasks):

2
src/documents/tests/test_api.py
View File

@@ -2661,7 +2661,6 @@ class TestTasks(APITestCase):
self.client.force_authenticate(user=self.user) self.client.force_authenticate(user=self.user)
def test_get_tasks(self): def test_get_tasks(self):
task_id1 = str(uuid.uuid4()) task_id1 = str(uuid.uuid4())
PaperlessTask.objects.create(task_id=task_id1) PaperlessTask.objects.create(task_id=task_id1)
Task.objects.create( Task.objects.create(
@@ -2687,7 +2686,6 @@ class TestTasks(APITestCase):
self.assertIsNone(returned_task2["attempted_task"]) self.assertIsNone(returned_task2["attempted_task"])
def test_acknowledge_tasks(self): def test_acknowledge_tasks(self):
task_id = str(uuid.uuid4()) task_id = str(uuid.uuid4())
task = PaperlessTask.objects.create(task_id=task_id) task = PaperlessTask.objects.create(task_id=task_id)