fix: Null on submissionMessage means disabled

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
nextcloud · Aug 26, 2023 · cf134e5 · cf134e5
1 parent 090b65f
commit cf134e5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
@@ -395,8 +395,10 @@ public function updateForm(int $id, array $keyValuePairs): DataResponse {
 		}
 
 		// Create FormEntity with given Params & Id.
-		$form = Form::fromParams($keyValuePairs);
-		$form->setId($id);
+		foreach ($keyValuePairs as $key => $value) {
+			$method = 'set' . ucfirst($key);
+			$form->$method($value);
+		}
 
 		// Update changed Columns in Db.
 		$this->formMapper->update($form);

diff --git a/lib/Db/Form.php b/lib/Db/Form.php
@@ -52,8 +52,8 @@
  * @method void setShowExpiration(bool $value)
  * @method integer getLastUpdated()
  * @method void setLastUpdated(integer $value)
- * @method string getSubmissionMessage()
- * @method void setSubmissionMessage(string $value)
+ * @method ?string getSubmissionMessage()
+ * @method void setSubmissionMessage(?string $value)
  */
 class Form extends Entity {
 	protected $hash;
@@ -106,7 +106,7 @@ public function read() {
 			'submitMultiple' => (bool)$this->getSubmitMultiple(),
 			'showExpiration' => (bool)$this->getShowExpiration(),
 			'lastUpdated' => (int)$this->getLastUpdated(),
-			'submissionMessage' => $this->getSubmissionMessage() ?? '',
+			'submissionMessage' => $this->getSubmissionMessage(),
 		];
 	}
 }
diff --git a/lib/Migration/Version030400Date20230628011500.php b/lib/Migration/Version030400Date20230628011500.php
@@ -48,7 +48,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		if (!$table->hasColumn('submission_message')) {
 			$table->addColumn('submission_message', Types::STRING, [
 				'notnull' => false,
-				'default' => '',
+				'default' => null,
 				'length' => 2048,
 				'comment' => 'custom thank you message',
 			]);

diff --git a/src/components/SidebarTabs/SettingsSidebarTab.vue b/src/components/SidebarTabs/SettingsSidebarTab.vue
@@ -61,7 +61,7 @@
 		</div>
 		<NcCheckboxRadioSwitch :checked="hasCustomSubmissionMessage"
 			type="switch"
-			@update:checked="onUpdateShowSubmissionMessageInput">
+			@update:checked="onUpdateHasCustomSubmissionMessage">
 			{{ t('forms', 'Custom submission message') }}
 		</NcCheckboxRadioSwitch>
 		<div v-show="hasCustomSubmissionMessage"
@@ -130,7 +130,6 @@ export default {
 			maxStringLengths: loadState('forms', 'maxStringLengths'),
 			/** If custom submission message is shown as input or rendered markdown */
 			editMessage: false,
-			showSubmissionMessageInput: false,
 		}
 	},
 
@@ -139,7 +138,7 @@ export default {
 		 * If the form has a custom submission message or the user wants to add one (settings switch)
 		 */
 		hasCustomSubmissionMessage() {
-			return !!this.form?.submissionMessage || this.showSubmissionMessageInput
+			return this.form?.submissionMessage !== undefined && this.form?.submissionMessage !== null
 		},
 
 		/**
@@ -218,10 +217,14 @@ export default {
 			this.$emit('update:formProp', 'submissionMessage', target.value)
 		},
 
-		onUpdateShowSubmissionMessageInput() {
-			this.showSubmissionMessageInput = !this.showSubmissionMessageInput
-			// Remove submission message if disabled
-			if (!this.showSubmissionMessageInput && this.form.submissionMessage) {
+		/**
+		 * Enable or disable the whole custom submission message
+		 * Disabled means the value is set to null.
+		 */
+		onUpdateHasCustomSubmissionMessage() {
+			if (this.hasCustomSubmissionMessage) {
+				this.$emit('update:formProp', 'submissionMessage', null)
+			} else {
 				this.$emit('update:formProp', 'submissionMessage', '')
 			}
 		},

diff --git a/src/views/Submit.vue b/src/views/Submit.vue
@@ -64,12 +64,11 @@
 			</template>
 		</NcEmptyContent>
 		<NcEmptyContent v-else-if="success || !form.canSubmit"
-			:title="t('forms', 'Thank you for completing the form!')"
-			:description="form.submissionMessage">
+			:title="t('forms', 'Thank you for completing the form!')">
 			<template #icon>
 				<IconCheck :size="64" />
 			</template>
-			<template v-if="form.submissionMessage" #description>
+			<template v-if="typeof form.submissionMessage === 'string'" #description>
 				<!-- eslint-disable-next-line vue/no-v-html -->
 				<p class="submission-message" v-html="submissionMessageHTML" />
 			</template>