Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch '232_resources_comment' into 'master'

Browse Source 
232 resources comment

See merge request Chill-Projet/chill-bundles!276
This commit is contained in:
Mathieu Jaumotte
2022-01-13 11:05:15 +00:00
parent 5a79df0e0a 11d4450244
commit 6c71cb0e80
31 changed files with 502 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
View File

@@ -133,7 +133,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
/**
* @ORM\Column(name="comment", type="text", nullable=true)
* @Groups({"read"})
*/
private ?string $comment = null;

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

@@ -38,25 +38,9 @@
<i class="fa fa-li fa-hand-o-right"></i>
<b class="me-2">{{ $t('child_of') }}</b>
<span class="chill-entity badge-thirdparty">{{ thirdparty.parent.text }}</span>
<!-- console: [Vue warn]: Failed to resolve component: on-the-fly ...
<on-the-fly type="thirdparty" action="show" :id="thirdparty.parent.id"
:buttonText="thirdparty.parent.text" :displayBadge="'true' === 'true'"
></on-the-fly>
-->
</li>
<!-- TODO hasChildren
<li v-if="hasChildren">
<i class="fa fa-li fa-hand-o-right"></i>
<b class="me-2">{{ $t('children') }}</b>
<span v-for="child in thirdparty.activeChildren">
<on-the-fly type="thirdparty"
action="show"
:id="child.id"
:buttonText="child.text"
displayBadge="'true' === 'true'">
</on-the-fly>
</span>
</li>
NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file.
-->
</ul>
<confidential v-if="thirdparty.contactDataAnonymous">
@@ -91,9 +75,6 @@
<a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
</li>
</ul>
<div v-if="options.addComment && !thirdparty.contactDataAnonymous && thirdparty.comment">
<blockquote class="chill-user-quote">{{ thirdparty.comment }}</blockquote>
</div>
</div>
</div>
</div>

5
src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
View File

@@ -14,7 +14,6 @@
hLevel: 3,
addCenter: true,
addNoData: true,
addComment: true,
isMultiline: true
}"
></third-party-render-box>
@@ -169,7 +168,7 @@ export default {
getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
this.thirdparty = thirdparty;
this.thirdparty.kind = thirdparty.kind;
console.log('get thirdparty', thirdparty);
//console.log('get thirdparty', thirdparty);
if (this.action !== 'show') {
if (thirdparty.address !== null) {
// bof! we force getInitialAddress because addressId not available when mounted
@@ -190,7 +189,7 @@ export default {
}
},
mounted() {
console.log('mounted', this.action);
//console.log('mounted', this.action);
if (this.action !== 'create') {
this.loadData();
} else {

1
src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
View File

@@ -46,7 +46,6 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
'comment' => $thirdParty->getComment(),
];
}