Rename widget_id to field_id to increase consistency

Author: codingjoe

django_select2/forms.py

@@ -221,6 +221,7 @@ def __init__(self, attrs=None, choices=(), **kwargs):
             self.attrs = {}
 
         self.uuid = str(uuid.uuid4())
+        self.field_id = signing.dumps(self.uuid)
         self.data_view = kwargs.pop('data_view', None)
         self.data_url = kwargs.pop('data_url', None)
 
@@ -253,9 +254,7 @@ def build_attrs(self, base_attrs, extra_attrs=None):
 
         attrs = super().build_attrs(default_attrs, extra_attrs=extra_attrs)
 
-        self.widget_id = signing.dumps(self.uuid)
-
-        attrs['data-field_id'] = self.widget_id
+        attrs['data-field_id'] = self.field_id
 
         attrs['class'] += ' django-select2-heavy'
         return attrs

tests/test_forms.py

@@ -388,7 +388,7 @@ def test_ajax_view_registration(self, client):
         widget.render('name', 'value')
         url = reverse('django_select2:auto-json')
         genre = Genre.objects.last()
-        response = client.get(url, data=dict(field_id=widget.widget_id,
+        response = client.get(url, data=dict(field_id=widget.field_id,
                                              term=genre.title))
         assert response.status_code == 200, response.content
         data = json.loads(response.content.decode('utf-8'))

tests/test_views.py

@@ -20,7 +20,7 @@ def test_get(self, client, artists):
         artist = artists[0]
         form = AlbumModelSelect2WidgetForm()
         assert form.as_p()
-        field_id = form.fields['artist'].widget.widget_id
+        field_id = form.fields['artist'].widget.field_id
         url = reverse('django_select2:auto-json')
         response = client.get(url, {'field_id': field_id, 'term': artist.title})
         assert response.status_code == 200
@@ -55,7 +55,7 @@ def test_pagination(self, genres, client):
             search_fields=['title__icontains']
         )
         widget.render('name', None)
-        field_id = widget.widget_id
+        field_id = widget.field_id
 
         response = client.get(url, {'field_id': field_id, 'term': ''})
         assert response.status_code == 200
@@ -76,7 +76,7 @@ def test_label_from_instance(self, artists, client):
         form = AlbumModelSelect2WidgetForm()
         form.fields['artist'].widget = ArtistCustomTitleWidget()
         assert form.as_p()
-        field_id = form.fields['artist'].widget.widget_id
+        field_id = form.fields['artist'].widget.field_id
 
         artist = artists[0]
         response = client.get(url, {'field_id': field_id, 'term': artist.title})
@@ -90,7 +90,7 @@ def test_url_check(self, client, artists):
         artist = artists[0]
         form = AlbumModelSelect2WidgetForm()
         assert form.as_p()
-        field_id = form.fields['artist'].widget.widget_id
+        field_id = form.fields['artist'].widget.field_id
         cache_key = form.fields['artist'].widget._get_cache_key()
         widget_dict = cache.get(cache_key)
         widget_dict['url'] = 'yet/another/url'