Merge pull request #39594 from /issues/39593

Add support for the x-office/drawing mimetype
owncloud · Dec 15, 2021 · f1b53cc · f1b53cc
2 parents 32339b3 + 59d9f58
commit f1b53cc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 0 deletions.
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
@@ -37,6 +37,7 @@
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
+$templateManager->registerTemplate('application/vnd.oasis.opendocument.graphics', 'core/templates/filetemplates/template.odg');
 
 \OCA\Files\App::getNavigationManager()->add(function () {
 	$l = \OC::$server->getL10N('files');

diff --git a/changelog/10.9.0_2021-12-09/39594 b/changelog/10.9.0_2021-12-09/39594
@@ -0,0 +1,4 @@
+Enhancement: Add support for the x-office/drawing mimetype
+
+https://github.com/owncloud/core/pull/39594
+https://github.com/owncloud/core/issues/39593
diff --git a/core/img/filetypes/x-office-drawing.svg b/core/img/filetypes/x-office-drawing.svg
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
@@ -47,6 +47,9 @@ OC.MimeTypeList={
     "application/vnd.oasis.opendocument.text-master": "x-office/document",
     "application/vnd.oasis.opendocument.text-template": "x-office/document",
     "application/vnd.oasis.opendocument.text-web": "x-office/document",
+    "application/vnd.oasis.opendocument.graphics-flat-xml": "x-office/drawing",
+    "application/vnd.oasis.opendocument.graphics": "x-office/drawing",
+    "application/vnd.oasis.opendocument.graphics-template": "x-office/drawing",
     "application/vnd.openxmlformats-officedocument.presentationml.presentation": "x-office/presentation",
     "application/vnd.openxmlformats-officedocument.presentationml.slideshow": "x-office/presentation",
     "application/vnd.openxmlformats-officedocument.presentationml.template": "x-office/presentation",
@@ -108,6 +111,7 @@ OC.MimeTypeList={
     "video",
     "x-office-document",
     "x-office-presentation",
+    "x-office-drawing",
     "x-office-spreadsheet"
 ],
 	themes: []

diff --git a/core/templates/filetemplates/template.odg b/core/templates/filetemplates/template.odg
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
@@ -38,6 +38,9 @@
 	"application/vnd.oasis.opendocument.text-master": "x-office/document",
 	"application/vnd.oasis.opendocument.text-template": "x-office/document",
 	"application/vnd.oasis.opendocument.text-web": "x-office/document",
+	"application/vnd.oasis.opendocument.graphics-flat-xml": "x-office/drawing",
+	"application/vnd.oasis.opendocument.graphics": "x-office/drawing",
+	"application/vnd.oasis.opendocument.graphics-template": "x-office/drawing",
 	"application/vnd.openxmlformats-officedocument.presentationml.presentation": "x-office/presentation",
 	"application/vnd.openxmlformats-officedocument.presentationml.slideshow": "x-office/presentation",
 	"application/vnd.openxmlformats-officedocument.presentationml.template": "x-office/presentation",

diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
@@ -48,6 +48,7 @@
 	"exe": ["application/x-ms-dos-executable"],
 	"flac": ["audio/flac"],
 	"flv": ["video/x-flv"],
+	"fodg": ["application/vnd.oasis.opendocument.graphics-flat-xml"],
 	"gif": ["image/gif"],
 	"gz": ["application/x-gzip", "application/gzip"],
 	"gzip": ["application/x-gzip", "application/gzip"],