From febc2783fd5c22df605e33d9b0ac2e239dcab1d7 Mon Sep 17 00:00:00 2001 From: jorgepastorr Date: Sun, 26 Nov 2023 10:43:17 +0100 Subject: [PATCH] commet conflict lines in migrations systemusers --- .gitignore | 3 +++ orchestra/contrib/systemusers/migrations/0001_initial.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0bca9ea5..c6d1a57c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ local_settings.py build *.egg-info +/.Trash* +/.git +/.idea diff --git a/orchestra/contrib/systemusers/migrations/0001_initial.py b/orchestra/contrib/systemusers/migrations/0001_initial.py index 30ea85fe..5cd524ff 100644 --- a/orchestra/contrib/systemusers/migrations/0001_initial.py +++ b/orchestra/contrib/systemusers/migrations/0001_initial.py @@ -11,7 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), + # migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('directory', models.CharField(blank=True, help_text="Optional directory relative to user's home.", max_length=256, verbose_name='directory')), ('shell', models.CharField(choices=[('/dev/null', 'No shell, FTP only'), ('/bin/rssh', 'No shell, SFTP/RSYNC only'), ('/usr/bin/git-shell', 'No shell, GIT only'), ('/bin/bash', '/bin/bash')], default='/dev/null', max_length=32, verbose_name='shell')), ('is_active', models.BooleanField(default=True, help_text='Designates whether this account should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), - ('account', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='systemusers', to=settings.AUTH_USER_MODEL, verbose_name='Account')), + # ('account', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='systemusers', to=settings.AUTH_USER_MODEL, verbose_name='Account')), ('groups', models.ManyToManyField(blank=True, help_text='A new group will be created for the user. Which additional groups would you like them to be a member of?', to='systemusers.SystemUser')), ], ),