Merge branch '2022.11' into main

tine20 · May 11, 2022 · 380e550 · 380e550
2 parents 5057ed1 + 597b22d
commit 380e550
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 16 deletions.
diff --git a/tine20/Tasks/Controller/Task.php b/tine20/Tasks/Controller/Task.php
@@ -283,12 +283,14 @@ protected function _updateAlarms(Tinebase_Record_Interface $_record, Tinebase_Re
 
         if ($_record->alarms instanceof Tinebase_Record_RecordSet) {
             foreach ($_record->alarms as $alarm) {
-                $alarm->alarm_time = $alarm->alarm_time->add($dueDiff);
-                if ($alarm->sent_status != 'pending') {
-                    $alarm->sent_status = 'pending';
-                    $alarm->sent_time = null;
-                    $alarm-> sent_message = null;
-                }
+               if ($alarm->alarm_time && $alarm->options == '{"custom":false}') {
+                   $alarm->alarm_time = $alarm->alarm_time->add($dueDiff);
+                   if ($alarm->sent_status != 'pending') {
+                       $alarm->sent_status = 'pending';
+                       $alarm->sent_time = null;
+                       $alarm-> sent_message = null;
+                   }
+               }
             }
         }
 

diff --git a/tine20/Tasks/js/TaskEditDialog.js b/tine20/Tasks/js/TaskEditDialog.js
@@ -184,7 +184,8 @@ Ext.namespace('Tine.Tasks');
                     }], [new Ext.ux.form.DateTimeField({
                             defaultTime: '12:00',
                             fieldLabel: this.app.i18n._('Due date'),
-                            name: 'due'
+                            name: 'due',
+                            listeners: {scope: this, change: this.validateDue},
                         }), 
                         new Tine.Tinebase.widgets.keyfield.ComboBox({
                             fieldLabel: this.app.i18n._('Priority'),
@@ -256,7 +257,16 @@ Ext.namespace('Tine.Tasks');
             }), this.alarmPanel
             ]
         };
-    }
+    },
+
+     validateDue: function() {
+         var dueField = this.getForm().findField('due'),
+             due = dueField.getValue();
+
+         if (Ext.isDate(due) && due.getTime() - Date.now() <= 0) {
+             dueField.markInvalid(this.app.i18n._('Attention: This due date is in the past!'));
+         }
+     }
 });
 
 /**

diff --git a/tine20/Tasks/translations/de.po b/tine20/Tasks/translations/de.po
@@ -25,9 +25,6 @@ msgstr ""
 msgid "Add New Task"
 msgstr "Neue Aufgabe hinzufügen"
 
-msgid "Create New Task"
-msgstr "Als neue Aufgabe hinzufügen"
-
 #: js/TaskEditDialog.js:140
 msgid "You have to supply a due date, because an alarm ist set!"
 msgstr "Sie müssen ein Fälligkeitsdatum angeben, da ein Alarm gesetzt wurde!"
@@ -46,7 +43,7 @@ msgstr "Priorität"
 
 #: js/TaskEditDialog.js:202 Model/Task.php:116 Model/Task.php:309
 msgid "Organizer"
-msgstr "Verantwortlich"
+msgstr "Organisator"
 
 #: js/TaskEditDialog.js:203
 msgid "Add Responsible ..."
@@ -195,8 +192,13 @@ msgid "Tasks status available"
 msgstr "Verfügbare Taskstatus"
 
 #: Config.php:40
-msgid "Possible tasks status. Please note that additional attendee status might impact other Tasks systems on export or syncronisation."
-msgstr "Verfügbare Aufgabenstatus. Bitte beachten Sie, dass zusätzliche Werte beim Export oder der Synchronisation mit anderen Systemen nicht berücksichtigt werden könnten."
+msgid ""
+"Possible tasks status. Please note that additional attendee status might "
+"impact other Tasks systems on export or syncronisation."
+msgstr ""
+"Verfügbare Aufgabenstatus. Bitte beachten Sie, dass zusätzliche Werte beim "
+"Export oder der Synchronisation mit anderen Systemen nicht berücksichtigt "
+"werden könnten."
 
 #: Config.php:48
 msgid "No response"
@@ -215,8 +217,12 @@ msgid "Task priorities available"
 msgstr "Verfügbare Aufgabenprioritäten"
 
 #: Config.php:59
-msgid "Possible task priorities. Please note that additional priorities might impact other Tasks systems on export or syncronisation."
-msgstr "Verfügbare Aufgabenprioritäten. Please note that additional attendee status might impact other Tasks systems on export or syncronisation."
+msgid ""
+"Possible task priorities. Please note that additional priorities might "
+"impact other Tasks systems on export or syncronisation."
+msgstr ""
+"Verfügbare Aufgabenprioritäten. Please note that additional attendee status "
+"might impact other Tasks systems on export or syncronisation."
 
 #: Config.php:66
 msgid "low"
@@ -327,6 +333,11 @@ msgstr "Gemeinsame Aufgaben-Favoriten verwalten"
 msgid "Create or update shared tasks favorites"
 msgstr "Gemeinsame Aufgaben-Favoriten erstellen oder bearbeiten"
 
+msgid "Create New Task"
+msgstr "Als neue Aufgabe hinzufügen"
+
 msgid "Creating new Task..."
 msgstr "Erstelle neue Aufgabe..."
 
+msgid "Attention: This due date is in the past!"
+msgstr "Achtung: Das Fälligkeitsdatum liegt in der Vergangenheit!"