Skip to content

Commit df43ee9

Browse files
committed
refactor(itam): Update URL route name for Software model
ref: #823 #820
1 parent bdbcc46 commit df43ee9

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

app/itam/serializers/software.py

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

2323
url = serializers.HyperlinkedIdentityField(
24-
view_name="v2:_api_v2_software-detail", format="html"
24+
view_name="v2:_api_software-detail", format="html"
2525
)
2626

2727
class Meta:

app/itam/tests/functional/software/test_software_viewset.py

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

2828
app_namespace = 'v2'
2929

30-
url_name = '_api_v2_software'
30+
url_name = '_api_software'
3131

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

app/itam/urls_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
)
7474
router.register(
7575
prefix = 'software', viewset = software_v2.ViewSet,
76-
basename = '_api_v2_software'
76+
basename = '_api_software'
7777
)
7878
router.register(
7979
prefix = 'software/(?P<software_id>[0-9]+)/installs', viewset = device_software_v2.ViewSet,

app/itam/viewsets/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ def list(self, request, pk=None):
2828
"device": reverse('v2:_api_device-list', request=request),
2929
"inventory": reverse('v2:_api_v2_inventory-list', request=request),
3030
"operating_system": reverse('v2:_api_operatingsystem-list', request=request),
31-
"software": reverse('v2:_api_v2_software-list', request=request)
31+
"software": reverse('v2:_api_software-list', request=request)
3232
}
3333
)

app/itam/viewsets/software_version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class ViewSet( ModelViewSet ):
132132
def get_back_url(self) -> str:
133133

134134

135-
return reverse('v2:_api_v2_software-detail',
135+
return reverse('v2:_api_software-detail',
136136
request = self.request,
137137
kwargs = {
138138
'pk': self.kwargs['software_id']
@@ -156,7 +156,7 @@ def get_queryset(self):
156156
def get_return_url(self) -> str:
157157

158158

159-
return reverse('v2:_api_v2_software-detail',
159+
return reverse('v2:_api_software-detail',
160160
request = self.request,
161161
kwargs = {
162162
'pk': self.kwargs['software_id']

0 commit comments

Comments
 (0)