@ -59,12 +59,12 @@ class DeviceModelSerializer(
|
||||
|
||||
get_url.update({
|
||||
|
||||
'device_model': reverse("v2:_api_v2_device_model-list", request=self._context['view'].request),
|
||||
'device_type': reverse("v2:_api_v2_device_type-list", request=self._context['view'].request),
|
||||
'device_model': reverse("v2:_api_devicemodel-list", request=self._context['view'].request),
|
||||
'device_type': reverse("v2:_api_devicetype-list", request=self._context['view'].request),
|
||||
'external_links': reverse("v2:_api_v2_external_link-list", request=self._context['view'].request) + '?devices=true',
|
||||
'operating_system': reverse("v2:_api_v2_device_operating_system-list", request=self._context['view'].request, kwargs={'device_id': item.pk}),
|
||||
'service': reverse("v2:_api_v2_service_device-list", request=self._context['view'].request, kwargs={'device_id': item.pk}),
|
||||
'software': reverse("v2:_api_v2_device_software-list", request=self._context['view'].request, kwargs={'device_id': item.pk}),
|
||||
'software': reverse("v2:_api_devicesoftware-list", request=self._context['view'].request, kwargs={'device_id': item.pk}),
|
||||
'tickets': reverse(
|
||||
"v2:_api_v2_item_tickets-list",
|
||||
request=self._context['view'].request,
|
||||
|
2
app/tests/fixtures/model_centurionaudit.py
vendored
2
app/tests/fixtures/model_centurionaudit.py
vendored
@ -12,7 +12,7 @@ def model_centurionaudit():
|
||||
|
||||
|
||||
@pytest.fixture( scope = 'class')
|
||||
def kwargs_centurionaudit(django_db_blocker,
|
||||
def kwargs_centurionaudit(django_db_blocker,
|
||||
kwargs_centurionmodel, model_contenttype,
|
||||
kwargs_user, model_user
|
||||
):
|
||||
|
18
app/tests/fixtures/model_centurionmodelnote.py
vendored
18
app/tests/fixtures/model_centurionmodelnote.py
vendored
@ -31,15 +31,15 @@ def kwargs_centurionmodelnote(django_db_blocker,
|
||||
**user_kwargs,
|
||||
)
|
||||
|
||||
kwargs = {
|
||||
**kwargs,
|
||||
'body': 'a random note',
|
||||
'created_by': user,
|
||||
'content_type': model_contenttype.objects.get(
|
||||
app_label = user._meta.app_label,
|
||||
model = user._meta.model_name,
|
||||
),
|
||||
}
|
||||
kwargs = {
|
||||
**kwargs,
|
||||
'body': 'a random note',
|
||||
'created_by': user,
|
||||
'content_type': model_contenttype.objects.get(
|
||||
app_label = user._meta.app_label,
|
||||
model = user._meta.model_name,
|
||||
),
|
||||
}
|
||||
|
||||
yield kwargs.copy()
|
||||
|
||||
|
5
app/tests/fixtures/model_instance.py
vendored
5
app/tests/fixtures/model_instance.py
vendored
@ -85,10 +85,11 @@ def model_instance(django_db_blocker, model_user, model, model_kwargs):
|
||||
|
||||
if random_field:
|
||||
|
||||
random_str = str(datetime.datetime.now(tz=datetime.timezone.utc))
|
||||
random_str = str(datetime.datetime.now(tz=datetime.timezone.utc)).replace(
|
||||
' ', '').replace(':', '').replace('+', '').replace('.', '')
|
||||
|
||||
kwargs.update({
|
||||
random_field: str( random_field ) + '_' + random_str
|
||||
random_field: str( random_field ) + '' + random_str
|
||||
})
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user