diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue index b03b98b23..e50c2a41f 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue @@ -1,11 +1,11 @@ @@ -44,10 +44,10 @@ ref="castThirdparty">
-

{{ $t('onthefly.resource_comment_title') }}

-
- {{ parent.comment }} -
+

{{ $t('onthefly.resource_comment_title') }}

+
+ {{ parent.comment }} +
@@ -104,12 +104,11 @@ export default { }, computed: { hasResourceComment() { - //console.log('hasResourceComment', this.parent); - return (typeof this.parent !== 'undefined' && this.parent !== null) - && this.action === 'show' - && this.parent.type === 'accompanying_period_resource' - && (this.parent.comment !== null && this.parent.comment !== '') - ; + return (typeof this.parent !== 'undefined' && this.parent !== null) + && this.action === 'show' + && this.parent.type === 'accompanying_period_resource' + && (this.parent.comment !== null && this.parent.comment !== '') + ; }, classAction() { switch (this.action) { diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue index 78253b43f..0149fc5d6 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue @@ -34,18 +34,27 @@
@@ -96,10 +105,12 @@ import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue'; import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue'; import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue'; +// import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue'; export default { name: "ThirdPartyRenderBox", components: { + // OnTheFly, AddressRenderBox, Confidential, BadgeEntity, @@ -124,17 +135,16 @@ export default { return !(this.thirdparty.parent === null || this.thirdparty.parent === undefined); }, getProfession() { + let profession = [] if (this.hasParent) { - console.log('im here') - let profession = [] profession.push(this.thirdparty.profession.name.fr) return profession; } if (!this.hasParent && this.thirdparty.category) { - return this.thirdparty.category.map((category) => category.text); + profession = this.thirdparty.category.map((category) => category.text); } - + return profession; } /* TODO need backend normalizer to serve children without circular reference hasChildren() {