Skip to content

Commit

Permalink
chore: more work on getting detail view working
Browse files Browse the repository at this point in the history
  • Loading branch information
jon-nfc committed Oct 11, 2024
1 parent 430ac4b commit f9b1f19
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 6 deletions.
10 changes: 8 additions & 2 deletions app/api/v2/serializers/core/ticket_linked_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from access.serializers.organization import OrganizationBaseSerializer
from api.v2.serializers.assistance.request import TicketBaseSerializer

from core.fields.badge import BadgeField
from core.models.ticket.ticket_linked_items import TicketLinkedItem


Expand All @@ -15,20 +16,25 @@ class TicketLinkedItemBaseSerializer(serializers.ModelSerializer):

def get_display_name(self, item):

return str( item )
return '#' + str( item.ticket.id )

url = serializers.HyperlinkedIdentityField(
view_name="API:_api_v2_device-detail", format="html"
)

created = serializers.DateTimeField(source='ticket.created')

status_badge = BadgeField(source='ticket.status_badge')

class Meta:

model = TicketLinkedItem

fields = [
'id',
'display_name',
# 'name',
'status_badge',
'created'
'url',
]

Expand Down
4 changes: 4 additions & 0 deletions app/api/v2/views/itam/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ class ViewSet(OrganizationMixin, viewsets.ModelViewSet):

metadata_class = NavigationMetadata

model_documentation: str = 'https://nofusscomputing.com/docs'

documentation: str = 'https://nofusscomputing.com/docs/not_model_docs'

permission_classes = [
OrganizationPermissionAPI
]
Expand Down
8 changes: 7 additions & 1 deletion app/api/v2/views/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ def determine_metadata(self, request, view):

metadata['actions']['PUT'] = self.field_choices(metadata['actions']['PUT'])

metadata['documentation'] = 'https://nofusscomputing.com/docs'
if hasattr(view, 'model_documentation'):

metadata['documentation'] = getattr(view, 'model_documentation')

# for field_name, value in metadata['actions']['PUT'].items():

Expand Down Expand Up @@ -93,6 +95,10 @@ def determine_metadata(self, request, view):

metadata['table_fields'] = view.queryset.model.table_fields

if hasattr(view, 'documentation'):

metadata['documentation'] = getattr(view, 'documentation')

if 'actions' in metadata:

if request.method in metadata['actions']:
Expand Down
6 changes: 5 additions & 1 deletion app/core/models/ticket/ticket_linked_items.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ class Modules(models.IntegerChoices):
verbose_name = 'Item ID',
)

table_fields: list = []
table_fields: list = [
'display_name',
'status_badge',
'created'
]

def __str__(self) -> str:

Expand Down
8 changes: 6 additions & 2 deletions app/itam/models/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,13 @@ def validate_hostname_format(self):
},
{
"name": "Tickets",
"layout": "table",
"slug": "tickets",
"field": "tickets",
"sections": [
{
"layout": "table",
"field": "tickets",
}
],
},
{
"name": "Notes",
Expand Down

0 comments on commit f9b1f19

Please sign in to comment.