mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Merge the storage_type migrations
This commit is contained in:
		| @@ -12,9 +12,19 @@ class Migration(migrations.Migration): | ||||
|     ] | ||||
|  | ||||
|     operations = [ | ||||
|  | ||||
|         # Add the field with the default GPG-encrypted value | ||||
|         migrations.AddField( | ||||
|             model_name='document', | ||||
|             name='storage_type', | ||||
|             field=models.CharField(choices=[('unencrypted', 'Unencrypted'), ('gpg', 'Encrypted with GNU Privacy Guard')], default='gpg', editable=False, max_length=11), | ||||
|         ), | ||||
|  | ||||
|         # Now that the field is added, change the default to unencrypted | ||||
|         migrations.AlterField( | ||||
|             model_name='document', | ||||
|             name='storage_type', | ||||
|             field=models.CharField(choices=[('unencrypted', 'Unencrypted'), ('gpg', 'Encrypted with GNU Privacy Guard')], default='unencrypted', editable=False, max_length=11), | ||||
|         ), | ||||
|  | ||||
|     ] | ||||
|   | ||||
| @@ -1,20 +0,0 @@ | ||||
| # -*- coding: utf-8 -*- | ||||
| # Generated by Django 1.11.13 on 2018-05-27 16:53 | ||||
| from __future__ import unicode_literals | ||||
|  | ||||
| from django.db import migrations, models | ||||
|  | ||||
|  | ||||
| class Migration(migrations.Migration): | ||||
|  | ||||
|     dependencies = [ | ||||
|         ('documents', '0021_document_storage_type'), | ||||
|     ] | ||||
|  | ||||
|     operations = [ | ||||
|         migrations.AlterField( | ||||
|             model_name='document', | ||||
|             name='storage_type', | ||||
|             field=models.CharField(choices=[('unencrypted', 'Unencrypted'), ('gpg', 'Encrypted with GNU Privacy Guard')], default='unencrypted', editable=False, max_length=11), | ||||
|         ), | ||||
|     ] | ||||
		Reference in New Issue
	
	Block a user
	 Daniel Quinn
					Daniel Quinn