Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix conflict list occasionally not appearing #1437

Merged
merged 2 commits into from
Mar 14, 2024
Merged

Fix conflict list occasionally not appearing #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69cb581
handle `ConflictListItem` jurisdiction being undefined
semmatti Mar 13, 2024
72c17ef
bump version
semmatti Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion components/examine/recipe/compare/Item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
<span class="truncate">{{ conflict.text }}</span>
<div class="space-x-8">
<span>{{ conflict.nrNumber }}</span>
<span>{{ formatJurisdiction(conflict.jurisdiction) }}</span>
<span>
{{
conflict.jurisdiction
? formatJurisdiction(conflict.jurisdiction)
: '?'
}}
</span>
<span class="whitespace-pre">
{{ getFormattedDate(conflict.startDate) }}
</span>
Expand Down
6 changes: 5 additions & 1 deletion components/examine/recipe/conflicts/ListItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
<div class="flex w-52 gap-4">
<span class="w-24">{{ conflictItem.nrNumber }}</span>
<span class="w-4">
{{ examine.getShortJurisdiction(conflictItem.jurisdiction) || '?' }}
{{
conflictItem.jurisdiction
? examine.getShortJurisdiction(conflictItem.jurisdiction) || '?'
: '?'
}}
</span>
<span class="w-24">
{{ getFormattedDate(conflictItem.startDate) }}
Expand Down
Loading