Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix bug to resolve onthefly component within thirdparty renderbox

Browse Source
This commit is contained in:
Julie Lenaerts 2022-02-25 13:58:17 +01:00
parent d486f2ddfc
commit c416f1ef6d
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<a v-if="isDisplayBadge" @click="openModal"> <a v-if="isDisplayBadge" @click="openModal">
<span class="chill-entity" :class="badgeType"> hello <span class="chill-entity" :class="badgeType">
{{ buttonText }}<span v-if="isDead"> (‡)</span> {{ buttonText }}<span v-if="isDead"> (‡)</span>
</span> </span>
</a> </a>

13
src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
View File

@ -41,16 +41,13 @@
<li v-if="hasParent"> <li v-if="hasParent">
<i class="fa fa-li fa-hand-o-right"></i> <i class="fa fa-li fa-hand-o-right"></i>
<b class="me-2">{{ $t('child_of') }}</b> <b class="me-2">{{ $t('child_of') }}</b>
<!-- <on-the-fly <on-the-fly
:type="thirdparty.parent.type" :type="thirdparty.parent.type"
:id="thirdparty.parent.id" :id="thirdparty.parent.id"
:buttonText="thirdparty.parent.text" :buttonText="thirdparty.parent.text"
:displayBadge="'true' === 'true'" :displayBadge="'true' === 'true'"
action="show"> action="show">
</on-the-fly> --> </on-the-fly>
<span class="chill-entity badge-thirdparty">
{{ thirdparty.parent.text}}
</span>
</li> </li>
<!-- TODO hasChildren <!-- TODO hasChildren
NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file. NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file.
@ -105,16 +102,18 @@
import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue'; import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue'; import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue'; import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
// import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
export default { export default {
name: "ThirdPartyRenderBox", name: "ThirdPartyRenderBox",
components: { components: {
// OnTheFly,
AddressRenderBox, AddressRenderBox,
Confidential, Confidential,
BadgeEntity, BadgeEntity,
}, },
// To avoid components recursively invoking eachother resolve OnTheFly component here
beforeCreate() {
this.$options.components.OnTheFly = require('ChillMainAssets/vuejs/OnTheFly/components/OnTheFly').default;
},
i18n: { i18n: {
messages: { messages: {
fr: { fr: {