From f3bfe2975115636df06425b9b6b45b918c4f4658 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Mon, 17 Jul 2023 11:17:05 -0400
Subject: [PATCH] Rename choices to extra_choices (prep for #12194)

---
 netbox/extras/api/serializers.py                      | 2 +-
 netbox/extras/forms/bulk_import.py                    | 4 ++--
 netbox/extras/forms/model_forms.py                    | 2 +-
 netbox/extras/migrations/0096_customfieldchoiceset.py | 4 ++--
 netbox/extras/models/customfields.py                  | 6 +++++-
 netbox/extras/tables/tables.py                        | 4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 7e4598293..fc5f44358 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -135,7 +135,7 @@ class CustomFieldChoiceSetSerializer(ValidatedModelSerializer):
     class Meta:
         model = CustomFieldChoiceSet
         fields = [
-            'id', 'url', 'display', 'name', 'description', 'choices', 'created', 'last_updated',
+            'id', 'url', 'display', 'name', 'description', 'extra_choices', 'created', 'last_updated',
         ]
 
 
diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py
index 350481195..577d4e3ee 100644
--- a/netbox/extras/forms/bulk_import.py
+++ b/netbox/extras/forms/bulk_import.py
@@ -67,7 +67,7 @@ class CustomFieldImportForm(CSVModelForm):
 
 
 class CustomFieldChoiceSetImportForm(CSVModelForm):
-    choices = SimpleArrayField(
+    extra_choices = SimpleArrayField(
         base_field=forms.CharField(),
         required=False,
         help_text=_('Comma-separated list of field choices')
@@ -76,7 +76,7 @@ class CustomFieldChoiceSetImportForm(CSVModelForm):
     class Meta:
         model = CustomFieldChoiceSet
         fields = (
-            'name', 'description', 'choices',
+            'name', 'description', 'extra_choices',
         )
 
 
diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py
index 614a5dfd9..b6b3820ec 100644
--- a/netbox/extras/forms/model_forms.py
+++ b/netbox/extras/forms/model_forms.py
@@ -86,7 +86,7 @@ class CustomFieldChoiceSetForm(BootstrapMixin, forms.ModelForm):
 
     class Meta:
         model = CustomFieldChoiceSet
-        fields = ('name', 'description', 'choices')
+        fields = ('name', 'description', 'extra_choices')
 
 
 class CustomLinkForm(BootstrapMixin, forms.ModelForm):
diff --git a/netbox/extras/migrations/0096_customfieldchoiceset.py b/netbox/extras/migrations/0096_customfieldchoiceset.py
index 94843f4b2..8b600410a 100644
--- a/netbox/extras/migrations/0096_customfieldchoiceset.py
+++ b/netbox/extras/migrations/0096_customfieldchoiceset.py
@@ -19,7 +19,7 @@ def create_choice_sets(apps, schema_editor):
     for cf in choice_fields:
         choiceset = CustomFieldChoiceSet.objects.create(
             name=f'{cf.name} Choices',
-            choices=cf.choices
+            extra_choices=cf.choices
         )
         cf.choice_set = choiceset
 
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
                 ('last_updated', models.DateTimeField(auto_now=True, null=True)),
                 ('name', models.CharField(max_length=100, unique=True)),
                 ('description', models.CharField(blank=True, max_length=200)),
-                ('choices', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), size=None)),
+                ('extra_choices', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), size=None)),
             ],
             options={
                 'ordering': ('name',),
diff --git a/netbox/extras/models/customfields.py b/netbox/extras/models/customfields.py
index 68118525c..b5d95ec31 100644
--- a/netbox/extras/models/customfields.py
+++ b/netbox/extras/models/customfields.py
@@ -653,7 +653,7 @@ class CustomFieldChoiceSet(ChangeLoggedModel):
         max_length=200,
         blank=True
     )
-    choices = ArrayField(
+    extra_choices = ArrayField(
         base_field=models.CharField(max_length=100),
         help_text=_('Comma-separated list of available choices (for selection fields)')
     )
@@ -666,3 +666,7 @@ class CustomFieldChoiceSet(ChangeLoggedModel):
 
     def get_absolute_url(self):
         return reverse('extras:customfieldchoiceset', args=[self.pk])
+
+    @property
+    def choices(self):
+        return self.extra_choices
diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py
index 03da7a2bd..1abdf5c1e 100644
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -85,9 +85,9 @@ class CustomFieldChoiceSetTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = CustomFieldChoiceSet
         fields = (
-            'pk', 'id', 'name', 'description', 'choices', 'created', 'last_updated',
+            'pk', 'id', 'name', 'description', 'extra_choices', 'created', 'last_updated',
         )
-        default_columns = ('pk', 'name', 'description', 'choices')
+        default_columns = ('pk', 'name', 'description', 'extra_choices')
 
 
 class CustomLinkTable(NetBoxTable):