jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/CSR-96

Browse source
This commit is contained in:
Leah Schumann 2022-04-08 16:11:14 -04:00
commit b5c86c5cd7
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common-components/funnel-header/funnel-header.vue
View file

@ -9,8 +9,8 @@
class="position-absolute rounded-0 w-100 border-0 shadow-sm" class="position-absolute rounded-0 w-100 border-0 shadow-sm"
v-if="displayGlobalAlert" v-if="displayGlobalAlert"
:alertClass="globalAlertMessage.type" :alertClass="globalAlertMessage.type"
:alertHeadline="globalAlertMessage.messageHeadline" :manualHeadline="globalAlertMessage.messageHeadline"
:alertCopy="globalAlertMessage.messageCopy" :manualCopy="globalAlertMessage.messageCopy"
v-bind:isDismissible="globalAlertMessage.isDismissible" v-bind:isDismissible="globalAlertMessage.isDismissible"
/> />
</template> </template>

6
src/ux-components/alert/alert.vue
View file

@ -39,13 +39,15 @@ export default {
*/ */
alertClass: String, alertClass: String,
cmsWidgetName: String, cmsWidgetName: String,
manualHeadline: String,
manualCopy: String,
}, },
computed: { computed: {
alertHeadline(){ alertHeadline(){
return this.getCmsContent(this.cmsWidgetName, 'HeadlineText'); return this.cmsWidgetName ? this.getCmsContent(this.cmsWidgetName, 'HeadlineText') : this.manualHeadline;
}, },
alertCopy(){ alertCopy(){
return this.getCmsContent(this.cmsWidgetName, 'BodyText'); return this.cmsWidgetName ? this.getCmsContent(this.cmsWidgetName, 'BodyText') : this.manualCopy;
}, },
}, },
}; };