Skip to content

Commit be61435

Browse files
committed
feat(itam): Update url basename
ref: #804 #799
1 parent 6fa37d7 commit be61435

10 files changed

Lines changed: 11 additions & 11 deletions

File tree

app/core/serializers/centurionmodelnote.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def get_display_name(self, item) -> str:
2222
return str( item )
2323

2424
url = serializers.HyperlinkedIdentityField(
25-
view_name="v2:_api_v2_device-detail", format="html"
25+
view_name="v2:_api_device-detail", format="html"
2626
)
2727

2828
class Meta:

app/itam/serializers/device.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def get_display_name(self, item) -> str:
2525
return str( item )
2626

2727
url = serializers.HyperlinkedIdentityField(
28-
view_name="v2:_api_v2_device-detail", format="html"
28+
view_name="v2:_api_device-detail", format="html"
2929
)
3030

3131
class Meta:
@@ -62,7 +62,7 @@ def get_url(self, item) -> dict:
6262
'device_model': reverse("v2:_api_devicemodel-list", request=self._context['view'].request),
6363
'device_type': reverse("v2:_api_devicetype-list", request=self._context['view'].request),
6464
'external_links': reverse("v2:_api_v2_external_link-list", request=self._context['view'].request) + '?devices=true',
65-
'operating_system': reverse("v2:_api_v2_device_operating_system-list", request=self._context['view'].request, kwargs={'device_id': item.pk}),
65+
'operating_system': reverse("v2:_api_device_operating_system-list", request=self._context['view'].request, kwargs={'device_id': item.pk}),
6666
'service': reverse("v2:_api_v2_service_device-list", request=self._context['view'].request, kwargs={'device_id': item.pk}),
6767
'software': reverse("v2:_api_devicesoftware-list", request=self._context['view'].request, kwargs={'device_id': item.pk}),
6868
'tickets': reverse(

app/itam/tests/functional/device/device_viewset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ViewSetBase:
2828

2929
app_namespace = 'v2'
3030

31-
url_name = '_api_v2_device'
31+
url_name = '_api_device'
3232

3333
change_data = {'name': 'device-change'}
3434

app/itam/tests/functional/device_operating_system/device_operating_system_viewset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ViewSetBase:
2626

2727
app_namespace = 'v2'
2828

29-
url_name = '_api_v2_device_operating_system'
29+
url_name = '_api_device_operating_system'
3030

3131
change_data = {'name': '1.1'}
3232

app/itam/tests/unit/device/device_api_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def setUpTestData(self):
9595
)
9696

9797
client = Client()
98-
url = reverse('v2:_api_v2_device-detail', kwargs=self.url_view_kwargs)
98+
url = reverse('v2:_api_device-detail', kwargs=self.url_view_kwargs)
9999

100100

101101
client.force_login(self.view_user)

app/itam/tests/unit/device/unit_device_viewset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class DeviceViewsetList(
1616

1717
viewset = ViewSet
1818

19-
route_name = 'v2:_api_v2_device'
19+
route_name = 'v2:_api_device'
2020

2121
@classmethod
2222
def setUpTestData(self):

app/itam/tests/unit/device_operating_system/device_operating_system_api_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def setUpTestData(self):
140140
)
141141

142142
client = Client()
143-
url = reverse('v2:_api_v2_device_operating_system-detail', kwargs=self.url_view_kwargs)
143+
url = reverse('v2:_api_device_operating_system-detail', kwargs=self.url_view_kwargs)
144144

145145

146146
client.force_login(self.view_user)

app/itam/tests/unit/device_operating_system/unit_device_operating_system_viewset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class DeviceOperatingSystemViewsetList(
1616

1717
viewset = ViewSet
1818

19-
route_name = 'v2:_api_v2_device_operating_system'
19+
route_name = 'v2:_api_device_operating_system'
2020

2121

2222
@classmethod

app/itam/urls_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
router.register(
4545
prefix = 'device/(?P<device_id>[0-9]+)/operating_system',
4646
viewset = device_operating_system.ViewSet,
47-
basename = '_api_v2_device_operating_system')
47+
basename = '_api_device_operating_system')
4848
router.register(
4949
prefix = 'device/(?P<device_id>[0-9]+)/software', viewset = device_software_v2.ViewSet,
5050
basename = '_api_devicesoftware'

app/itam/viewsets/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def list(self, request, pk=None):
2525

2626
return Response(
2727
{
28-
"device": reverse('v2:_api_v2_device-list', request=request),
28+
"device": reverse('v2:_api_device-list', request=request),
2929
"inventory": reverse('v2:_api_v2_inventory-list', request=request),
3030
"operating_system": reverse('v2:_api_v2_operating_system-list', request=request),
3131
"software": reverse('v2:_api_v2_software-list', request=request)

0 commit comments

Comments
 (0)