Browse Source

post MR fix

Olivier Massot 1 year ago
parent
commit
41acc9d49e
1 changed files with 4 additions and 7 deletions
  1. 4 7
      components/Ui/Form.vue

+ 4 - 7
components/Ui/Form.vue

@@ -344,13 +344,10 @@ const cancel = () => {
 
   em.reset(props.model, props.entity)
 
-  if (router) {
-    if (requestedLeavingRoute.value !== null) {
-      navigateTo(requestedLeavingRoute.value)
-    } else {
-      //@ts-ignore
-      router.push(formStore.goAfterLeave) // TODO: voir si on peut pas passer ça comme prop du component
-    }
+  if (requestedLeavingRoute.value !== null) {
+    navigateTo(requestedLeavingRoute.value)
+  } else if (formStore.goAfterLeave !== null) {
+    router.push(formStore.goAfterLeave) // TODO: voir si on peut pas passer ça comme prop du component
   }
 }