@afeefa/vue-app 0.0.210 → 0.0.211

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.210
+0.0.211

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.210",
+  "version": "0.0.211",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/form/EditModal.vue

@@ -40,7 +40,8 @@
           </v-btn>
 
           <edit-form-buttons
-            :changed="changed || _changed"
+            :changed="changed"
+            :forceActive="forceActive"
             :valid="validFromOutside && valid"
             angular
             :has="{reset: reset && !!modelToEdit.id}"
@@ -61,15 +62,11 @@ import { Component, Vue, Watch } from '@a-vue'
 import { DialogEvent } from '@a-vue/events'
 
 @Component({
-  props: ['model', 'createModelToEdit', 'show', {reset: true, valid: true, changed: false}]
+  props: ['model', 'createModelToEdit', 'show', {reset: true, valid: true, forceActive: false}]
 })
 export default class EditModal extends Vue {
   show_ = false
 
-  get _changed () {
-    return this.changed
-  }
-
   created () {
     if (!this.model && !this.createModelToEdit) {
       console.warn('You need to pass either a model or a model factory to <edit-modal>.')
@@ -117,7 +114,7 @@ export default class EditModal extends Vue {
 
   async beforeClose () {
     // run only if show_ is true to prevent double checks with a-modal
-    if (this.show_ && (this.$refs.form.changed || this._changed)) {
+    if (this.show_ && (this.$refs.form.changed)) {
       const result = await this.$events.dispatch(new DialogEvent(DialogEvent.SHOW, {
         title: 'Änderungen verwerfen?',
         message: 'Im Formular sind nicht gespeicherte Änderungen. Sollen diese verworfen werden?',

package/src-admin/components/form/EditFormButtons.vue

@@ -64,7 +64,7 @@ import { mdiRotateLeft} from '@mdi/js'
   props: [
     'changed',
     'valid',
-    {angular: false, small: false}
+    {angular: false, small: false, forceActive: false}
   ]
 })
 export default class EditFormButtons extends Vue {
@@ -73,7 +73,19 @@ export default class EditFormButtons extends Vue {
   undoIcon = mdiRotateLeft
 
   get disabled () {
-    return (this.$has.reset && !this.changed) || !this.valid
+    if (!this.valid) {
+      return true
+    }
+
+    if (this.forceActive) {
+      return false
+    }
+
+    if (this.$has.reset) {
+      return !this.changed
+    }
+
+    return false
   }
 }
 </script>