Address: remove forceRedirect option: backUrl option not null is considerated as forceRedirect true

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue

@@ -252,7 +252,6 @@ export default {
                validFrom: false,
                validTo: false
             },
-            forceRedirect: false,
             hideAddress: false
          },
          entity: {
@@ -324,6 +323,9 @@ export default {
       bypassFirstStep() {
          // exception: passing step0 if new address and pane are not in modal
          return !this.context.edit && !this.inModal;
+      },
+      forceRedirect() {
+         return this.context.backUrl !== null;
       }
    },
    mounted() {
@@ -396,7 +398,7 @@ export default {
             this.openDatePane();
          } else {
             this.applyChanges();
-            if (!this.options.forceRedirect) {
+            if (!this.forceRedirect) {
                this.openShowPane();
             }
          }
@@ -425,7 +427,7 @@ export default {
       */
       afterLastPaneAction(params) {
          this.initForm();
-         if (this.options.forceRedirect === true) {
+         if (this.forceRedirect) {
             console.log("redirect to backUrl");
             window.location.assign(this.context.backUrl);
          } else {

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue

@@ -86,8 +86,7 @@ export default {
             this.options.hideAddress : this.defaultz.hideAddress;
       },
       forceRedirect() {
-         return (typeof this.options.forceRedirect !== 'undefined') ?
+         return this.context.backUrl !== null;
-            this.options.forceRedirect : this.defaultz.forceRedirect;
       },
       noAddressWithStickyActions() {
          return !this.context.edit && !this.address.id && this.options.stickyActions;

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

@@ -52,9 +52,6 @@ containers.forEach((container) => {
                             validTo: container.dataset.useValidTo === 'true'       //boolean, default: false
                         },
 
-                        /// Force redirection after last step (cfr. backUrl)
-                        forceRedirect: container.dataset.forceRedirect === 'true',  //boolean, default: false
-
                         /// Don't display show renderbox Address: showPane display only a button
                         hideAddress: container.dataset.hideAddress === 'true'       //boolean, default: false
                     }

src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig

@@ -18,7 +18,6 @@
     * stickyActions         bool (default: false)
     * useValidFrom          bool (default: false)
     * useValidTo            bool (default: false)
-    * forceRedirect         bool (default: false)
     * hideAddress           bool (default: false)
 #}
 <div class="address-container"
@@ -70,10 +69,6 @@
         data-use-valid-to="true"
     {% endif %}
 
-    {% if forceRedirect is defined and forceRedirect == 1 %}
-        data-force-redirect="true"
-    {% endif %}
-
     {% if hideAddress is defined and hideAddress == 1 %}
         data-hide-address="true"
     {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig

@@ -29,9 +29,11 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
-            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             openPanesInModal: false,
         } %}
+        {#
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
+        #}
 
     {% endblock %}
 

src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig

@@ -29,10 +29,10 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
-            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             stickyActions: true,
         } %}
         {#
+            backUrl: path('chill_person_address_list', { 'person_id': person.id }),
             openPanesInModal: false,
             useValidFrom: true,
         #}

src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig

@@ -9,12 +9,10 @@
         {# include vue_address component #}
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
-            stickyActions: true
-        } %}
-        {#
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
+            stickyActions: true,
             openPanesInModal: false,
-        #}
+        } %}
     </div>
 
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig

@@ -10,12 +10,9 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-            forceRedirect: true,
+            openPanesInModal: false,
             stickyActions: true,
         } %}
-        {#
-            openPanesInModal: false,
-        #}
     </div>
 
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig

@@ -18,14 +18,13 @@
                 {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                     targetEntity: { name: 'household', id: household.id },
                     backUrl: path('chill_person_household_addresses', { 'household_id': household.id }),
-                    forceRedirect: true,
                     mode: 'new',
-                    useValidFrom: true,
                     buttonSize: 'btn-lg',
                     buttonText: 'Move household',
                     modalTitle: 'Move household',
                 } %}
                 {#
+                    useValidFrom: true,
                 #}
 
             </li>
@@ -68,8 +67,6 @@
                 }) }}
                 <ul class="record_actions">
                     <li>
-
-                        {# include vue_address component #}
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -32,7 +32,6 @@
                     {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                         targetEntity: { name: 'household', id: household.id },
                         backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
-                        forceRedirect: true,
                         hideAddress: true,
                         mode: 'new',
                         buttonSize: 'btn-sm',