merge conflicts fixed

2025-10-03 03:49:44 +00:00 · 2022-01-14 16:13:35 +01:00
parent 475585c5e7 cf4f6f06e9
commit 47615e2e5d
2 changed files with 12 additions and 0 deletions
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -61,6 +61,15 @@
            </on-the-fly-thirdparty>
         </template>

+         <template v-slot:body v-else-if="parent">
+            <on-the-fly-thirdparty
+               :parent="parent"
+               :action="action"
+               type="thirdparty"
+               ref="castThirdparty">
+            </on-the-fly-thirdparty>
+         </template>
+
         <template v-slot:body v-else>
            <on-the-fly-create
               :action="action"