Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.2.7 on 2025-11-01 16:57

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('adserver', '0104_auto_renew_payment_method'),
('adserver_auth', '0010_data_all_emails_verified'),
]

operations = [
migrations.AlterUniqueTogether(
name='useradvertisermember',
unique_together={('user', 'advertiser')},
),
]
2 changes: 2 additions & 0 deletions adserver/auth/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ class Meta:
# To do that, we needed to start with the same table
db_table = "adserver_auth_user_advertisers"

unique_together = ("user", "advertiser")


class UserPublisherMember(models.Model):
"""User-Publisher 'through' model."""
Expand Down
1 change: 1 addition & 0 deletions adserver/tests/test_advertiser_dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,7 @@ def test_authorized_users_invite_existing(self):
self.assertContains(response, "Successfully invited")
self.assertEqual(User.objects.filter(email=email).count(), 1)
self.assertEqual(User.objects.filter(name=name).count(), 1)
self.assertEqual(UserAdvertiserMember.objects.filter(advertiser=self.advertiser, user__email=email).count(), 1)

# The 2nd request didn't create a user or update the user's name
self.assertEqual(User.objects.filter(name="Yet Another User").count(), 0)
17 changes: 10 additions & 7 deletions adserver/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1857,13 +1857,16 @@ def dispatch(self, request, *args, **kwargs):
def form_valid(self, form):
result = super().form_valid(form)

# Add m2m and role
role = form.cleaned_data["role"]
UserAdvertiserMember.objects.create(
advertiser=self.advertiser,
user=self.object,
role=role,
)
if not UserAdvertiserMember.objects.filter(
advertiser=self.advertiser, user=self.object
).exists():
# Add m2m and role
role = form.cleaned_data["role"]
UserAdvertiserMember.objects.create(
advertiser=self.advertiser,
user=self.object,
role=role,
)

messages.success(
self.request,
Expand Down