Skip to content

Commit

Permalink
Merge pull request #139 from ymaheshwari1/#133
Browse files Browse the repository at this point in the history
Reverted: changes for null check for externalId those were removed in conflict resolution(#133)
  • Loading branch information
ravilodhi authored Dec 22, 2023
2 parents f0db820 + a268d07 commit 805664c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/views/FacilityDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -338,16 +338,16 @@
<ion-button fill="clear" color="danger" @click="removeFacilityMapping(mapping)">{{ translate("Remove") }}</ion-button>
</ion-card>

<!-- Hardcoded card to shop facility externalId, as externalID is not available as an identification -->
<ion-card>
<!-- Hardcoded card to show facility externalId, as externalID is not available as an identification -->
<ion-card v-if="current.externalId">
<ion-card-header>
<ion-card-title>
{{ translate('Facility External ID') }}
</ion-card-title>
</ion-card-header>
<ion-item lines="full">
<ion-label>{{ translate('Identification') }}</ion-label>
<ion-label slot="end">{{ current.externalId ? current.externalId : '-' }}</ion-label>
<ion-label slot="end">{{ current.externalId }}</ion-label>
</ion-item>
<!-- Using blur to remove the focus from button on click, as we need to focus the input field inside the modal opened
and we can't focus two elements at the same time -->
Expand Down

0 comments on commit 805664c

Please sign in to comment.