From 52e3112e0ea5f85f01b69314fe380e42ba196c15 Mon Sep 17 00:00:00 2001 From: Stefanie Stamer Date: Fri, 26 Jul 2024 15:10:06 +0200 Subject: [PATCH] tweak(Tinebase): allow import without AutoTags if no right to create shared Tags --- tine20/Tinebase/Import/Abstract.php | 7 ++++++- tine20/Tinebase/js/widgets/dialog/ImportDialog.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tine20/Tinebase/Import/Abstract.php b/tine20/Tinebase/Import/Abstract.php index 2efe2c4d7a..e83d758de9 100644 --- a/tine20/Tinebase/Import/Abstract.php +++ b/tine20/Tinebase/Import/Abstract.php @@ -952,7 +952,12 @@ protected function _getSingleTag($_name, $_tagData = array(), $_create = TRUE) 'name' => $name, ); /** @var Tinebase_Model_Tag $tag */ - $tag = Tinebase_Tags::getInstance()->createSharedTags([$tagData])->getFirstRecord(); + try { + $tag = Tinebase_Tags::getInstance()->createSharedTags([$tagData])->getFirstRecord(); + } catch (Tinebase_Exception_AccessDenied $e) { + if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ + . ' User has no grants to create Tags: ' . $e); + } } return $tag; diff --git a/tine20/Tinebase/js/widgets/dialog/ImportDialog.js b/tine20/Tinebase/js/widgets/dialog/ImportDialog.js index 87ed39524e..fb8d5a7836 100644 --- a/tine20/Tinebase/js/widgets/dialog/ImportDialog.js +++ b/tine20/Tinebase/js/widgets/dialog/ImportDialog.js @@ -413,7 +413,7 @@ Tine.widgets.dialog.ImportDialog = Ext.extend(Tine.widgets.dialog.WizardPanel, { show: function() { var options = this.getImportPluginOptions(); - if (options.autotags) { + if (options.autotags && Tine.Tinebase.common.hasRight('manage_shared_tags', 'Admin')) { var tags = options.autotags; Ext.each([].concat(tags), function(tag) {