Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix thirdparty renderbox after merge

Browse Source
This commit is contained in:
Julie Lenaerts 2021-12-13 19:37:19 +01:00
parent 19741530bf
commit 976f2fd41a
2 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
View File

@ -329,7 +329,6 @@ export default {
AddressRenderBox, AddressRenderBox,
ThirdPartyRenderBox, ThirdPartyRenderBox,
PickTemplate, PickTemplate,
ThirdPartyRenderBox,
OnTheFly OnTheFly
}, },
i18n, i18n,

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

@ -28,38 +28,38 @@
</div> </div>
<div class="item-col"> <div class="item-col">
<div class="float-button bottom"> <div class="float-button bottom">
<div class="box"> <div class="box">
<div class="action"> <div class="action">
<slot name="record-actions"></slot> <slot name="record-actions"></slot>
</div> </div>
<ul class="list-content fa-ul"> <ul class="list-content fa-ul">
<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>
<span class="chill-entity badge-thirdparty">{{ thirdparty.parent.text }}</span> <span class="chill-entity badge-thirdparty">{{ thirdparty.parent.text }}</span>
<!-- console: [Vue warn]: Failed to resolve component: on-the-fly ... <!-- console: [Vue warn]: Failed to resolve component: on-the-fly ...
<on-the-fly type="thirdparty" action="show" :id="thirdparty.parent.id" <on-the-fly type="thirdparty" action="show" :id="thirdparty.parent.id"
:buttonText="thirdparty.parent.text" :displayBadge="'true' === 'true'" :buttonText="thirdparty.parent.text" :displayBadge="'true' === 'true'"
></on-the-fly> ></on-the-fly>
--> -->
</li> </li>
<!-- TODO hasChildren <!-- TODO hasChildren
<li v-if="hasChildren"> <li v-if="hasChildren">
<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('children') }}</b> <b class="me-2">{{ $t('children') }}</b>
<span v-for="child in thirdparty.activeChildren"> <span v-for="child in thirdparty.activeChildren">
<on-the-fly type="thirdparty" <on-the-fly type="thirdparty"
action="show" action="show"
:id="child.id" :id="child.id"
:buttonText="child.text" :buttonText="child.text"
displayBadge="'true' === 'true'"> displayBadge="'true' === 'true'">
</on-the-fly> </on-the-fly>
</span> </span>
</li> </li>
--> -->
</ul> </ul>
<confidential v-if="thirdparty.contactDataAnonymous"> <confidential v-if="thirdparty.contactDataAnonymous">
<template v-slot:confidential-content> <template v-slot:confidential-content>
<ul class="list-content fa-ul"> <ul class="list-content fa-ul">
<li v-if="thirdparty.address"> <li v-if="thirdparty.address">
@ -76,29 +76,29 @@
</li> </li>
</ul> </ul>
</template> </template>
</confidential> </confidential>
<ul v-else class="list-content fa-ul"> <ul v-else class="list-content fa-ul">
<li v-if="thirdparty.address"> <li v-if="thirdparty.address">
<i class="fa fa-li fa-map-marker"></i> <i class="fa fa-li fa-map-marker"></i>
<address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box> <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
</li> </li>
<li v-if="thirdparty.phonenumber"> <li v-if="thirdparty.phonenumber">
<i class="fa fa-li fa-mobile"></i> <i class="fa fa-li fa-mobile"></i>
<a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a> <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
</li> </li>
<li v-if="thirdparty.email"> <li v-if="thirdparty.email">
<i class="fa fa-li fa-envelope-o"></i> <i class="fa fa-li fa-envelope-o"></i>
<a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a> <a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
</li> </li>
</ul> </ul>
<div v-if="options.addComment && !thirdparty.contactDataAnonymous && thirdparty.comment"> <div v-if="options.addComment && !thirdparty.contactDataAnonymous && thirdparty.comment">
<blockquote class="chill-user-quote">{{ thirdparty.comment }}</blockquote> <blockquote class="chill-user-quote">{{ thirdparty.comment }}</blockquote>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
</div> </div>