Save+new action for attributes

r3-fabian · May 19, 2023 · d46c7de · d46c7de
1 parent d218917
commit d46c7de
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 6 deletions.
diff --git a/www/comps/builder/builderAttribute.js b/www/comps/builder/builderAttribute.js
@@ -40,10 +40,15 @@ let MyBuilderAttribute = {
 			<div class="top lower">
 				<div class="area">
 					<my-button image="save.png"
-						@trigger="set"
+						@trigger="set(false)"
 						:active="canSave"
 						:caption="isNew ? capGen.button.create : capGen.button.save"
 					/>
+					<my-button image="save_new.png"
+						@trigger="set(true)"
+						:active="canSave"
+						:caption="isNew ? capGen.button.createNew : capGen.button.saveNew"
+					/>
 					<my-button image="refresh.png"
 						@trigger="reset"
 						:active="hasChanges"
@@ -108,7 +113,7 @@ let MyBuilderAttribute = {
 						<td>{{ capApp.usedFor }}</td>
 						<td>
 							<div class="row centered gap">
-								<select v-model="usedFor" :disabled="readonly">
+								<select v-model="usedFor" :disabled="readonly" @change="changedUsedFor">
 									<optgroup :label="capGen.standard">
 										<option value="text"     :disabled="!isNew && !isString">{{ capApp.option.text }}</option>
 										<option value="textarea" :disabled="!isNew && !isString">{{ capApp.option.textarea }}</option>
@@ -274,7 +279,7 @@ let MyBuilderAttribute = {
 		readonly:       { type:Boolean, required:true },
 		relation:       { type:Object,  required:true }
 	},
-	emits:['close','next-language'],
+	emits:['close','next-language','new-record'],
 	data() {
 		return {
 			defaultsOption:'fixed',
@@ -454,6 +459,10 @@ let MyBuilderAttribute = {
 		isAttributeUuid,
 
 		// actions
+		changedUsedFor() {
+			if(!this.isRelationship && this.values.relationshipId !== null)
+				this.values.relationshipId = null;
+		},
 		handleHotkeys(e) {
 			if(e.ctrlKey && e.key === 's' && this.canSave) {
 				this.set();
@@ -487,7 +496,7 @@ let MyBuilderAttribute = {
 					}
 				};
 
-			this.valuesOrg = JSON.parse(JSON.stringify(this.values));
+			this.resetOrg();
 
 			// set defaults option
 			switch(this.values.def) {
@@ -496,6 +505,9 @@ let MyBuilderAttribute = {
 				case 'GEN_RANDOM_UUID()':                this.defaultsOption = 'uuid';     break;
 			}
 		},
+		resetOrg() {
+			this.valuesOrg = JSON.parse(JSON.stringify(this.values));
+		},
 		updateDefaultsOption() {
 			switch(this.defaultsOption) {
 				case 'date':     this.values.def = 'EXTRACT(EPOCH FROM CURRENT_DATE)'; break;
@@ -537,7 +549,7 @@ let MyBuilderAttribute = {
 				this.$root.genericError
 			);
 		},
-		set() {
+		set(saveAndNew) {
 			if(this.values.encrypted && !this.canEncrypt)
 				this.values.encrypted = false;
 
@@ -547,6 +559,14 @@ let MyBuilderAttribute = {
 			],true).then(
 				() => {
 					this.$root.schemaReload(this.module.id);
+
+					if(saveAndNew) {
+						this.$emit('new-record');
+						this.values.id   = null;
+						this.values.name = '';
+						this.resetOrg();
+						return;
+					}
 					this.$emit('close');
 				},
 				this.$root.genericError

diff --git a/www/comps/builder/builderRelation.js b/www/comps/builder/builderRelation.js
@@ -240,6 +240,7 @@ let MyBuilderRelation = {
 						v-if="attributeIdEdit !== false"
 						@close="attributeIdEdit = false"
 						@nextLanguage="$emit('next-language')"
+						@new-record="attributeIdEdit = null"
 						:attributeId="attributeIdEdit"
 						:builderLanguage="builderLanguage"
 						:readonly="readonly"
@@ -555,7 +556,7 @@ let MyBuilderRelation = {
 	emits:['next-language'],
 	watch:{
 		relation:{
-			handler:function() { this.reset(); },
+			handler() { this.reset(); },
 			immediate:true
 		}
 	},

diff --git a/www/langs/REPLACE_BY_BUILD/de_de b/www/langs/REPLACE_BY_BUILD/de_de
@@ -10,6 +10,7 @@
 			"copy":"Kopieren",
 			"copyClipboard":"In Zwischenablage kopieren",
 			"create":"Erstellen",
+			"createNew":"Erstellen+Neu",
 			"delete":"Löschen",
 			"deleteHint":"Datensatz dauerhaft löschen",
 			"deleteSelected":"Ausgewählte löschen",

diff --git a/www/langs/REPLACE_BY_BUILD/en_us b/www/langs/REPLACE_BY_BUILD/en_us
@@ -10,6 +10,7 @@
 			"copy":"Copy",
 			"copyClipboard":"Copy to clipboard",
 			"create":"Create",
+			"createNew":"Create+New",
 			"delete":"Delete",
 			"deleteHint":"Permanently delete record",
 			"deleteSelected":"Delete selected",

diff --git a/www/langs/REPLACE_BY_BUILD/it_it b/www/langs/REPLACE_BY_BUILD/it_it
@@ -10,6 +10,7 @@
 			"copy":"Copy",
 			"copyClipboard":"Copy to clipboard",
 			"create":"Crea",
+			"createNew":"Crea+Nuovo",
 			"delete":"Cancella",
 			"deleteHint":"Cancella il record definitivamente",
 			"deleteSelected":"Cancella selezionati",

diff --git a/www/langs/REPLACE_BY_BUILD/ro_ro b/www/langs/REPLACE_BY_BUILD/ro_ro
@@ -10,6 +10,7 @@
 			"copy":"Copy",
 			"copyClipboard":"Copy to clipboard",
 			"create":"Crează",
+			"createNew":"Crează+Nou",
 			"delete":"Șterge",
 			"deleteHint":"Șterge definitiv înregistrarea selectată",
 			"deleteSelected":"Șterge selecția",