From e7f9fc59fa843b5812e9bc6e966d808bfd23bd38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 19 Feb 2021 16:06:46 +0100
Subject: [PATCH] Fix issues when creating a card from a talk message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Controller/CardController.php |  4 ++--
 src/CardCreateDialog.vue          | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/Controller/CardController.php b/lib/Controller/CardController.php
index dcb3e6046..b9238cb1d 100644
--- a/lib/Controller/CardController.php
+++ b/lib/Controller/CardController.php
@@ -78,8 +78,8 @@ class CardController extends Controller {
 	 * @param int $order
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function create($title, $stackId, $type = 'plain', $order = 999) {
-		return $this->cardService->create($title, $stackId, $type, $order, $this->userId);
+	public function create($title, $stackId, $type = 'plain', $order = 999, string $description = '') {
+		return $this->cardService->create($title, $stackId, $type, $order, $this->userId, $description);
 	}
 
 	/**
diff --git a/src/CardCreateDialog.vue b/src/CardCreateDialog.vue
index 122cc4838..8385ae823 100644
--- a/src/CardCreateDialog.vue
+++ b/src/CardCreateDialog.vue
@@ -58,7 +58,7 @@
 					type="text"
 					:placeholder="t('deck', 'Card title')"
 					:disabled="loading || !selectedStack">
-				<textarea v-model="description" :disabled="loading || !selectedStack" />
+				<textarea v-model="pendingDescription" :disabled="loading || !selectedStack" />
 				<div class="modal-buttons">
 					<button @click="close">
 						{{ t('deck', 'Cancel') }}
@@ -77,7 +77,7 @@
 				<EmptyContent v-else-if="created" icon="icon-checkmark">
 					{{ t('deck', '"{card}" was added to "{board}"', { card: pendingTitle, board: selectedBoard.title }) }}
 					<template #desc>
-						<button class="primary">
+						<button class="primary" @click="openNewCard">
 							{{ t('deck', 'Open card') }}
 						</button>
 						<button @click="close">
@@ -132,6 +132,7 @@ export default {
 			selectedBoard: '',
 			creating: false,
 			created: false,
+			newCard: null,
 		}
 	},
 	computed: {
@@ -171,17 +172,21 @@ export default {
 		},
 		async select() {
 			this.creating = true
-			await cardApi.addCard({
+			const response = await cardApi.addCard({
 				boardId: this.selectedBoard.id,
 				stackId: this.selectedStack.id,
 				title: this.pendingTitle,
 				description: this.pendingDescription,
 			})
+			this.newCard = response
 			this.creating = false
 			this.created = true
 			// We do not emit here since we want to give feedback to the user that the card was created
 			// this.$root.$emit('select', createdCard)
 		},
+		openNewCard() {
+			window.location = generateUrl('/apps/deck') + `#/board/${this.selectedBoard.id}/card/${this.newCard.id}`
+		},
 	},
 
 }