diff --git a/compensation/admin.py b/compensation/admin.py index 2821a14..c018621 100644 --- a/compensation/admin.py +++ b/compensation/admin.py @@ -81,13 +81,15 @@ class EcoAccountAdmin(AbstractCompensationAdmin): ] filter_horizontal = [ - "users" + "users", + "teams", ] def get_fields(self, request, obj=None): return super().get_fields(request, obj) + [ "deductable_surface", - "users" + "users", + "teams", ] diff --git a/compensation/migrations/0012_auto_20221116_1322.py b/compensation/migrations/0012_auto_20221116_1322.py new file mode 100644 index 0000000..947352a --- /dev/null +++ b/compensation/migrations/0012_auto_20221116_1322.py @@ -0,0 +1,26 @@ +# Generated by Django 3.1.3 on 2022-11-16 12:22 + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0006_auto_20220815_0759'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('compensation', '0011_ecoaccount_deductable_rest'), + ] + + operations = [ + migrations.AlterField( + model_name='ecoaccount', + name='teams', + field=models.ManyToManyField(blank=True, help_text='Teams having access (data shared with)', to='user.Team'), + ), + migrations.AlterField( + model_name='ecoaccount', + name='users', + field=models.ManyToManyField(blank=True, help_text='Users having access (data shared with)', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/ema/admin.py b/ema/admin.py index 7cd5a7f..dbfff3a 100644 --- a/ema/admin.py +++ b/ema/admin.py @@ -6,12 +6,14 @@ from ema.models import Ema class EmaAdmin(AbstractCompensationAdmin): filter_horizontal = [ - "users" + "users", + "teams", ] def get_fields(self, request, obj=None): return super().get_fields(request, obj) + [ - "users" + "users", + "teams", ] admin.site.register(Ema, EmaAdmin) diff --git a/ema/migrations/0008_auto_20221116_1322.py b/ema/migrations/0008_auto_20221116_1322.py new file mode 100644 index 0000000..c705358 --- /dev/null +++ b/ema/migrations/0008_auto_20221116_1322.py @@ -0,0 +1,26 @@ +# Generated by Django 3.1.3 on 2022-11-16 12:22 + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0006_auto_20220815_0759'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('ema', '0007_auto_20220815_1030'), + ] + + operations = [ + migrations.AlterField( + model_name='ema', + name='teams', + field=models.ManyToManyField(blank=True, help_text='Teams having access (data shared with)', to='user.Team'), + ), + migrations.AlterField( + model_name='ema', + name='users', + field=models.ManyToManyField(blank=True, help_text='Users having access (data shared with)', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/intervention/admin.py b/intervention/admin.py index 932ddb9..46f7244 100644 --- a/intervention/admin.py +++ b/intervention/admin.py @@ -14,7 +14,8 @@ class InterventionAdmin(BaseObjectAdmin): ] filter_horizontal = [ - "users" + "users", + "teams", ] def get_fields(self, request, obj=None): @@ -25,6 +26,7 @@ class InterventionAdmin(BaseObjectAdmin): "checked", "recorded", "users", + "teams", "geometry", ] diff --git a/intervention/migrations/0008_auto_20221116_1322.py b/intervention/migrations/0008_auto_20221116_1322.py new file mode 100644 index 0000000..f92b148 --- /dev/null +++ b/intervention/migrations/0008_auto_20221116_1322.py @@ -0,0 +1,26 @@ +# Generated by Django 3.1.3 on 2022-11-16 12:22 + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0006_auto_20220815_0759'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('intervention', '0007_auto_20220815_1030'), + ] + + operations = [ + migrations.AlterField( + model_name='intervention', + name='teams', + field=models.ManyToManyField(blank=True, help_text='Teams having access (data shared with)', to='user.Team'), + ), + migrations.AlterField( + model_name='intervention', + name='users', + field=models.ManyToManyField(blank=True, help_text='Users having access (data shared with)', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/konova/models/object.py b/konova/models/object.py index 015d34e..a1c8c9c 100644 --- a/konova/models/object.py +++ b/konova/models/object.py @@ -434,8 +434,16 @@ class CheckableObjectMixin(models.Model): class ShareableObjectMixin(models.Model): # Users having access on this object - users = models.ManyToManyField("user.User", help_text="Users having access (data shared with)") - teams = models.ManyToManyField("user.Team", help_text="Teams having access (data shared with)") + users = models.ManyToManyField( + "user.User", + help_text="Users having access (data shared with)", + blank=True + ) + teams = models.ManyToManyField( + "user.Team", + help_text="Teams having access (data shared with)", + blank=True + ) access_token = models.CharField( max_length=255, null=True,