Merge conflicts fixed

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue

@@ -5,6 +5,7 @@
         :action="context.action"
         :buttonText="options.buttonText"
         :displayBadge="options.displayBadge === 'true'"
+        :isDead="options.isDead"
         :parent="options.parent"
         @saveFormOnTheFly="saveFormOnTheFly">
     </on-the-fly>

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -1,15 +1,15 @@
 <template>
 
-   <a v-if="isDisplayBadge" @click="openModal">
-      <span class="chill-entity" :class="badgeType">
-         {{ buttonText }}
-      </span>
-   </a>
-   <a v-else class="btn btn-sm" target="_blank"
+    <a v-if="isDisplayBadge" @click="openModal">
+        <span class="chill-entity" :class="badgeType">
+            {{ buttonText }}<span v-if="isDead"> (‡)</span>
+        </span>
+    </a>
+    <a v-else class="btn btn-sm" target="_blank"
       :class="classAction"
       :title="$t(titleAction)"
       @click="openModal">
-      {{ buttonText }}
+      {{ buttonText }}<span v-if="isDead"> (‡)</span>
    </a>
 
    <teleport to="body">
@@ -101,7 +101,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'parent'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'canCloseModal'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
@@ -179,7 +179,20 @@ export default {
          return 'entity-' + this.type + ' badge-' + this.type;
       }
    },
+   watch: {
+      canCloseModal: {
+         handler: function(val, oldVal) {
+            if (val) {
+               this.closeModal();
+            }
+         },
+         deep: true
+      }
+   },
    methods: {
+      closeModal() {
+         this.modal.showModal = false;
+      },
       openModal() {
          // console.log('## OPEN ON THE FLY MODAL');
          // console.log('## type:', this.type, ', action:', this.action);
@@ -237,8 +250,6 @@ export default {
          console.log('type', type, 'data', data)
          // pass datas to parent
          this.$emit('saveFormOnTheFly', { type: type, data: data });
-
-         this.modal.showModal = false;
       },
       buildLocation(id, type) {
          if (type === 'person') {

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js

@@ -22,7 +22,8 @@ containers.forEach((container) => {
                     options: {
                         buttonText: container.dataset.buttonText || null,
                         displayBadge: container.dataset.displayBadge || false,
-                        parent: JSON.parse(container.dataset.parent) || null,
+                        isDead: container.dataset.isDead || false,
+                        parent: container.dataset.parent ? JSON.parse(container.dataset.parent) : null,
                     }
                 }
             }
@@ -33,4 +34,5 @@ containers.forEach((container) => {
     .mount(container);
 
     //console.log('container dataset', container.dataset);
+    //console.log('data-parent', container.dataset.parent);
 });