mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-03 03:16:10 -06:00 
			
		
		
		
	Fix migrations merge
This commit is contained in:
		@@ -4,6 +4,11 @@ from django.db import migrations
 | 
			
		||||
from django.db import models
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def make_existing_tasks_consume_auto(apps, schema_editor):
 | 
			
		||||
    PaperlessTask = apps.get_model("documents", "PaperlessTask")
 | 
			
		||||
    PaperlessTask.objects.all().update(type="auto_task", task_name="consume_file")
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Migration(migrations.Migration):
 | 
			
		||||
    dependencies = [
 | 
			
		||||
        ("documents", "1062_alter_savedviewfilterrule_rule_type"),
 | 
			
		||||
@@ -40,6 +45,10 @@ class Migration(migrations.Migration):
 | 
			
		||||
                verbose_name="Task Name",
 | 
			
		||||
            ),
 | 
			
		||||
        ),
 | 
			
		||||
        migrations.RunPython(
 | 
			
		||||
            make_existing_tasks_consume_auto,
 | 
			
		||||
            migrations.RunPython.noop,
 | 
			
		||||
        ),
 | 
			
		||||
        migrations.AlterField(
 | 
			
		||||
            model_name="workflowactionwebhook",
 | 
			
		||||
            name="url",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user