Skip to content

Commit b6928d3

Browse files
committed
users: {community,commercial}_terms_accepted
We don't use the fields anymore.
1 parent 04e87cb commit b6928d3

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

ansible_ai_connect/test_utils.py

-2
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,6 @@ def setUp(self):
214214
self.create_user()
215215

216216
self.user.user_id = str(uuid4())
217-
self.user.community_terms_accepted = timezone.now()
218-
self.user.save()
219217

220218
group_1, _ = Group.objects.get_or_create(name="Group 1")
221219
group_2, _ = Group.objects.get_or_create(name="Group 2")

ansible_ai_connect/users/admin.py

-13
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,14 @@ class MembershipInline(admin.TabularInline):
2828
extra = 0
2929

3030

31-
class UserTermsResource(resources.ModelResource):
32-
class Meta:
33-
model = User
34-
fields = ["username", "community_terms_accepted", "commercial_terms_accepted"]
35-
name = "Export only user terms"
36-
37-
3831
@admin.register(User)
3932
class WisdomUserAdmin(ExportMixin, UserAdmin):
40-
resource_classes = [UserTermsResource]
4133
# add any additional fields you want to display in the User page
4234
list_display = (
4335
"username",
4436
"is_staff",
45-
"community_terms_accepted",
46-
"commercial_terms_accepted",
4737
"uuid",
4838
)
49-
fieldsets = UserAdmin.fieldsets + (
50-
(None, {"fields": ("community_terms_accepted", "commercial_terms_accepted")}),
51-
)
5239
search_fields = UserAdmin.search_fields + ("uuid",)
5340

5441

ansible_ai_connect/users/management/commands/createtoken.py

-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ def handle(
7474
username=username,
7575
password=password,
7676
external_username=username,
77-
community_terms_accepted=n,
78-
commercial_terms_accepted=n,
7977
)
8078
if organization_id:
8179
u.organization = Organization.objects.get_or_create(id=organization_id)[0]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Generated by Django 4.2.16 on 2024-09-13 21:05
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
("users", "0013_user_email_verified_user_family_name_user_given_name_and_more"),
10+
]
11+
12+
operations = [
13+
migrations.RemoveField(
14+
model_name="user",
15+
name="commercial_terms_accepted",
16+
),
17+
migrations.RemoveField(
18+
model_name="user",
19+
name="community_terms_accepted",
20+
),
21+
]

ansible_ai_connect/users/models.py

-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ class Plan(models.Model):
5555

5656
class User(ExportModelOperationsMixin("user"), AbstractUser):
5757
uuid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
58-
community_terms_accepted = models.DateTimeField(default=None, null=True)
59-
commercial_terms_accepted = models.DateTimeField(default=None, null=True)
6058
organization_id = deprecate_field(models.IntegerField(default=None, null=True))
6159
organization = NonClashingForeignKey(
6260
Organization,

0 commit comments

Comments
 (0)