merge last AddPerson branch

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

@@ -64,6 +64,8 @@
          <template v-slot:body v-else>
             <on-the-fly-create
                :action="action"
+               :allowedTypes="allowedTypes"
+               :query="query"
                ref="castNew">
             </on-the-fly-create>
          </template>
@@ -101,7 +103,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'allowedTypes', 'query'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
@@ -144,6 +146,13 @@ export default {
                return 'action.addContact';
          }
       },
+      titleCreate() {
+         return this.allowedTypes.every(t => t === 'person')
+            ? 'onthefly.create.title.person'
+            : this.allowedTypes.every(t => t === 'thirdparty')
+               ? 'onthefly.create.title.thirdparty'
+               : 'onthefly.create.title.default'
+      },
       titleModal() {
          switch (this.action) {
             case 'show':
@@ -151,7 +160,7 @@ export default {
             case 'edit':
                return 'onthefly.edit.' + this.type;
             case 'create':
-               return 'onthefly.create.title';
+               return this.titleCreate;
             case 'addContact':
                return 'onthefly.addContact.title';
          }
@@ -177,7 +186,10 @@ export default {
       },
       badgeType() {
          return 'entity-' + this.type + ' badge-' + this.type;
-      }
+      },
+      getReturnPath() {
+         return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
+      },
    },
    methods: {
       closeModal() {
@@ -243,9 +255,9 @@ export default {
       buildLocation(id, type) {
          if (type === 'person') {
             // TODO i18n
-            return `/fr/person/${id}/general`;
+            return encodeURI(`/fr/person/${id}/general${this.getReturnPath}`);
          } else if (type === 'thirdparty') {
-            return `/fr/3party/3party/${id}/view`;
+            return encodeURI(`/fr/3party/3party/${id}/view${this.getReturnPath}`);
          }
       }
    }