nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

refactor(settings): Update URL route name for UserSettings model

Browse Source 
ref: #833 closes #836
This commit is contained in:
Jon Lockwood
2025-06-16 14:12:36 +09:30
parent 095239f199
commit 78539f2551
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/models/tokens.py
View File

@ -153,9 +153,9 @@ class AuthToken(models.Model):
if request:
return reverse(f"v2:_api_v2_user_settings_token-detail", request=request, kwargs = self.get_url_kwargs() )
return reverse(f"v2:_api_usersettings_token-detail", request=request, kwargs = self.get_url_kwargs() )
return reverse(f"v2:_api_v2_user_settings_token-detail", kwargs = self.get_url_kwargs() )
return reverse(f"v2:_api_usersettings_token-detail", kwargs = self.get_url_kwargs() )
def get_url_kwargs(self) -> dict:

2
app/api/tests/functional/auth_token/test_functional_auth_token_viewset.py
View File

@ -35,7 +35,7 @@ class ViewSetBase:
app_namespace = 'v2'
url_name = '_api_v2_user_settings_token'
url_name = '_api_usersettings_token'
change_data = {'device_model_is_global': True}

2
app/api/tests/unit/token/test_unit_auth_token_api_v2.py
View File

@ -74,7 +74,7 @@ class API(
)
client = Client()
url = reverse('v2:_api_v2_user_settings_token-detail', kwargs=self.url_view_kwargs)
url = reverse('v2:_api_usersettings_token-detail', kwargs=self.url_view_kwargs)
client.force_login(self.view_user)

2
app/api/tests/unit/token/test_unit_auth_token_viewset.py
View File

@ -20,7 +20,7 @@ class ViewsetList(
viewset = ViewSet
route_name = 'v2:_api_v2_user_settings_token'
route_name = 'v2:_api_usersettings_token'
@classmethod

2
app/api/viewsets/auth_token.py
View File

@ -103,7 +103,7 @@ class ViewSet(
return self._get_return_url
self._get_return_url = reverse(
'v2:_api_v2_user_settings-detail',
'v2:_api_usersettings-detail',
kwargs = {
'pk': self.kwargs['model_id']
},

6
app/settings/serializers/user_settings.py
View File

@ -17,7 +17,7 @@ class UserSettingsBaseSerializer(serializers.ModelSerializer):
return str( item )
url = serializers.HyperlinkedIdentityField(
view_name="v2:_api_v2_user_settings-detail", format="html"
view_name="v2:_api_usersettings-detail", format="html"
)
class Meta:
@ -47,9 +47,9 @@ class UserSettingsModelSerializer(UserSettingsBaseSerializer):
def get_url(self, item) -> dict:
return {
'_self': reverse("v2:_api_v2_user_settings-detail", request=self._context['view'].request, kwargs={'pk': item.pk}),
'_self': reverse("v2:_api_usersettings-detail", request=self._context['view'].request, kwargs={'pk': item.pk}),
'tokens': reverse(
"v2:_api_v2_user_settings_token-list",
"v2:_api_usersettings_token-list",
request=self._context['view'].request,
kwargs={
'model_id': item.user.pk

2
app/settings/tests/functional/user_settings/test_user_settings_viewset.py
View File

@ -37,7 +37,7 @@ class ViewSetBase:
app_namespace = 'v2'
url_name = '_api_v2_user_settings'
url_name = '_api_usersettings'
change_data = {'device_model_is_global': True}

2
app/settings/tests/unit/user_settings/test_unit_user_settings_viewset.py
View File

@ -19,7 +19,7 @@ class UserSettingsViewsetList(
viewset = ViewSet
route_name = 'v2:_api_v2_user_settings'
route_name = 'v2:_api_usersettings'
@classmethod

2
app/settings/tests/unit/user_settings/test_user_settings_api_v2.py
View File

@ -83,7 +83,7 @@ class UserSettingsAPI(
self.url_view_kwargs = {'pk': self.item.id}
client = Client()
url = reverse('v2:_api_v2_user_settings-detail', kwargs=self.url_view_kwargs)
url = reverse('v2:_api_usersettings-detail', kwargs=self.url_view_kwargs)
client.force_login(self.view_user)

8
app/settings/urls_api.py
View File

@ -36,7 +36,7 @@ from settings.viewsets import (
app_settings,
external_link,
index as settings_index_v2,
user_settings as user_settings_v2
user_settings
)
@ -111,12 +111,12 @@ router.register(
basename = '_api_ticketcommentcategory'
)
router.register(
prefix = 'user_settings', viewset = user_settings_v2.ViewSet,
basename = '_api_v2_user_settings'
prefix = 'user_settings', viewset = user_settings.ViewSet,
basename = '_api_usersettings'
)
router.register(
prefix = 'user_(?P<model_id>[0-9]+)/token', viewset = auth_token.ViewSet,
basename = '_api_v2_user_settings_token'
basename = '_api_usersettings_token'
)

2
app/settings/viewsets/index.py
View File

@ -122,7 +122,7 @@ class Index(IndexViewset):
"ticket_category": reverse('v2:_api_ticketcategory-list', request=request),
"ticket_comment_category": reverse('v2:_api_ticketcommentcategory-list', request=request),
"user_settings": reverse(
'v2:_api_v2_user_settings-detail',
'v2:_api_usersettings-detail',
request=request,
kwargs={
'pk': request.user.id