Skip to content

Commit

Permalink
Ensure color set in all calls to components
Browse files Browse the repository at this point in the history
  • Loading branch information
whitdog47 committed Oct 9, 2024
1 parent f61bbd2 commit 3722179
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/dispatch/static/dispatch/src/case/CaseSummaryTable.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-data-table :headers="headers" :items="items" :loading="loading">
<template #item.case_priority.name="{ value }">
<case-priority :priority="value" />
<template #item.case_priority.name="{ item, value }">
<case-priority :priority="value" :color="item.case_priority.color" />
</template>
<template #item.status="{ item, value }">
<case-status :status="value" :id="item.id" />
Expand Down
10 changes: 8 additions & 2 deletions src/dispatch/static/dispatch/src/case/TableExportDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,16 @@
:loading="previewRowsLoading"
>
<template #item.case_severity.name="{ item }">
<case-severity :severity="item.case_severity.name" />
<case-severity
:severity="item.case_severity.name"
:color="item.case_severity.color"
/>
</template>
<template #item.case_priority.name="{ item }">
<case-priority :priority="item.case_priority.name" />
<case-priority
:priority="item.case_priority.name"
:color="item.case_priority.color"
/>
</template>
<template #item.status="{ item }">
<case-status :status="item.status" :id="item.id" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-data-table hover :headers="headers" :items="items" :loading="loading">
<template #item.incident_priority.name="{ value }">
<incident-priority :priority="value" />
<template #item.incident_priority.name="{ item, value }">
<incident-priority :priority="value" :color="item.incident_priority.color" />
</template>
<template #item.status="{ item, value }">
<incident-status :status="value" :id="item.id" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
<v-list-item>
<v-list-item-title>Priority</v-list-item-title>
<v-list-item-subtitle class="text-right">
<incident-priority :priority="incident_priority.name" />
<incident-priority
:priority="incident_priority.name"
:color="incident_priority.color"
/>
</v-list-item-subtitle>
</v-list-item>
<v-list-item>
Expand Down
10 changes: 8 additions & 2 deletions src/dispatch/static/dispatch/src/incident/TableExportDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,16 @@
:loading="previewRowsLoading"
>
<template #item.incident_severity.name="{ item }">
<incident-severity :severity="item.incident_severity.name" />
<incident-severity
:severity="item.incident_severity.name"
:color="item.incident_severity.color"
/>
</template>
<template #item.incident_priority.name="{ item }">
<incident-priority :priority="item.incident_priority.name" />
<incident-priority
:priority="item.incident_priority.name"
:color="item.incident_priority.color"
/>
</template>
<template #item.status="{ item }">
<incident-status :status="item.status" :id="item.id" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,10 @@
:loading="previewRowsLoading"
>
<template #item.incident_priority.name="{ item }">
<incident-priority :priority="item.incident_priority.name" />
<incident-priority
:priority="item.incident_priority.name"
:color="item.incident_priority.color"
/>
</template>
<template #item.status="{ item }">
<incident-status :status="item.status" :id="item.id" />
Expand Down
5 changes: 4 additions & 1 deletion src/dispatch/static/dispatch/src/task/TableExportDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@
<incident-status :status="item.incident.status" :id="item.id" />
</template>
<template #item.incident_priority.name="{ item }">
<incident-priority :priority="item.incident.incident_priority.name" />
<incident-priority
:priority="item.incident.incident_priority.name"
:color="item.incident_priority.color"
/>
</template>
<template #item.creator.individual_contact.name="{ item }">
<participant :participant="item.creator" />
Expand Down
4 changes: 2 additions & 2 deletions src/dispatch/static/dispatch/src/task/TaskSummaryTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
{{ value }}
</v-chip>
</template>
<template #item.incident_priority.name="{ value }">
<incident-priority :priority="value" />
<template #item.incident_priority.name="{ item, value }">
<incident-priority :priority="value" :color="item.incident_priority.color" />
</template>
<template #item.creator="{ value }">
<participant :participant="value" />
Expand Down

0 comments on commit 3722179

Please sign in to comment.