Merge ed747d6ccb into 3cc5b6591e

Merge pull request #45051 from nextcloud/backport/44938/stable27
[stable27] fix(CalDAV): remove UNKNOWN from room / resource consideration
2024-04-26 13:53:07 -07:00 · 2024-04-26 14:24:57 +02:00 · 2024-04-26 11:21:28 +00:00 · 2024-04-25 12:34:02 +02:00
2 changed files with 18 additions and 17 deletions
--- a/apps/dav/lib/CalDAV/Schedule/IMipService.php
+++ b/apps/dav/lib/CalDAV/Schedule/IMipService.php
@ -680,7 +680,7 @@ class IMipService {
 			return false;
 		}
 		$type = $cuType->getValue() ?? 'INDIVIDUAL';
-		if (\in_array(strtoupper($type), ['RESOURCE', 'ROOM', 'UNKNOWN'], true)) {
+		if (\in_array(strtoupper($type), ['RESOURCE', 'ROOM'], true)) {
 			// Don't send emails to things
 			return true;
 		}
--- a/apps/files/src/views/TemplatePicker.vue
+++ b/apps/files/src/views/TemplatePicker.vue
@ -217,24 +217,25 @@ export default {
 				this.logger.debug('Created new file', fileInfo)

 				// Fetch FileInfo and model
-				const data = await fileList?.addAndFetchFileInfo(this.name).then((status, data) => data)
-				const model = new OCA.Files.FileInfoModel(data, {
-					filesClient: fileList?.filesClient,
-				})
-
-				// Run default action
-				const fileAction = OCA.Files.fileActions.getDefaultFileAction(fileInfo.mime, 'file', OC.PERMISSION_ALL)
-				if (fileAction) {
-					fileAction.action(fileInfo.basename, {
-						$file: fileList?.findFileEl(this.name),
-						dir: currentDirectory,
-						fileList,
-						fileActions: fileList?.fileActions,
-						fileInfoModel: model,
+				fileList?.addAndFetchFileInfo(this.name).then((status, data) => {
+					const model = new OCA.Files.FileInfoModel(data, {
+						filesClient: fileList?.filesClient,
 					})
-				}

-				this.close()
+					// Run default action
+					const fileAction = OCA.Files.fileActions.getDefaultFileAction(fileInfo.mime, 'file', OC.PERMISSION_ALL)
+					if (fileAction) {
+						fileAction.action(fileInfo.basename, {
+							$file: fileList?.findFileEl(this.name),
+							dir: currentDirectory,
+							fileList,
+							fileActions: fileList?.fileActions,
+							fileInfoModel: model,
+						})
+					}
+
+					this.close()
+				})
 			} catch (error) {
 				this.logger.error('Error while creating the new file from template')
 				console.error(error)
Author	SHA1	Message	Date
Julius Härtl	3bba812d5e	Merge `ed747d6ccb` into `3cc5b6591e`	2024-04-26 13:53:07 -07:00
Richard Steinmetz	3cc5b6591e	Merge pull request #45051 from nextcloud/backport/44938/stable27 [stable27] fix(CalDAV): remove UNKNOWN from room / resource consideration	2024-04-26 14:24:57 +02:00
Anna Larch	5e9da1bf46	fix(CalDAV): remove UNKNOWN from room / resource consideration Signed-off-by: Anna Larch <anna@nextcloud.com>	2024-04-26 11:21:28 +00:00
Julius Härtl	ed747d6ccb	fix: Wait until file has been added to filelist before opening Signed-off-by: Julius Härtl <jus@bitgrid.net>	2024-04-25 12:34:02 +02:00