Merge branch 'master' into 'issue427_returnPath'

# Conflicts:
#   CHANGELOG.md

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

@@ -90,7 +90,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'canCloseModal'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
@@ -165,16 +165,6 @@ export default {
          return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
       },
    },
-   watch: {
-      canCloseModal: {
-         handler: function(val, oldVal) {
-            if (val) {
-               this.closeModal();
-            }
-         },
-         deep: true
-      }
-   },
    methods: {
       closeModal() {
          this.modal.showModal = false;