fix(Calendar): Show error message when trying to add existing calendar

tine-groupware · Mar 19, 2024 · 2fb8000 · 2fb8000
1 parent de86986
commit 2fb8000
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/tine20/Calendar/js/ExceptionHandler.js b/tine20/Calendar/js/ExceptionHandler.js
@@ -39,6 +39,7 @@ Tine.Calendar.handleRequestException = function(exception, callback, callbackSco
     Tine.log.warn(exception);
 
     switch(exception.code) {
+        case 600: // Container already exists
         case 911: // Calendar_Exception_InvalidUrl
             Ext.MessageBox.show(defaults);
             break;

diff --git a/tine20/Calendar/translations/de.po b/tine20/Calendar/translations/de.po
@@ -2899,3 +2899,6 @@ msgstr "Resource: {name} schon reserviert"
 
 msgid "The resource {name} on floor {floorName} is reserved for selected date: {date} by {name1}."
 msgstr "Die Resource {name} im Stock {floorName} ist von {name1} für den Tag: {date} reserviert."
+
+msgid "The container already exists"
+msgstr "Der Container existiert bereits"
diff --git a/tine20/Calendar/translations/en.po b/tine20/Calendar/translations/en.po
@@ -2667,3 +2667,6 @@ msgstr "Remove all filters on change selection"
 
 msgid "On Calendar Change will remove all filters"
 msgstr "On Calendar Change will remove all filters"
+
+msgid "The container already exists"
+msgstr "The container already exists"
diff --git a/tine20/Calendar/translations/template.pot b/tine20/Calendar/translations/template.pot
@@ -2587,3 +2587,6 @@ msgstr ""
 #: Model/Resource.php:88
 msgid "Site"
 msgstr ""
+
+msgid "The container already exists"
+msgstr ""
diff --git a/tine20/Tinebase/Container.php b/tine20/Tinebase/Container.php
@@ -367,8 +367,7 @@ protected function _checkExistence(Tinebase_Model_Container $container)
         }
         $existingContainer = $this->_getExistingContainer($filter);
         if ($existingContainer) {
-            $translation = Tinebase_Translation::getTranslation();
-            throw new Tinebase_Exception_SystemGeneric($translation->_('The container already exists'));
+            throw new Tinebase_Exception_SystemGeneric('The container already exists');
         }
     }