Request 2441 (accepted)

Overview

Request 2441 (accepted)

Fix invalid time error

Created by vanmeeuwen over 5 years ago
In state accepted

Submit roundcubemail-plugins-kolab

Submit package Kolab:Winterfell / roundcubema...gins-kolab to package Kolab:16 / roundcubemail-plugins-kolab

roundcubemail-plugins-kolab.spec Changed

@@ -43,7 +43,7 @@
 Name:           roundcubemail-plugins-kolab
 Version:        3.4.3
 
-Release:        1%{?dot_rel_suffix}%{?dist}
+Release:        2%{?dot_rel_suffix}%{?dist}
 
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
@@ -63,6 +63,8 @@
 
 Patch1001:      roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch
 
+Patch0011:      0011-Calendar-Fix-invalid-time-error-when-using-time-form.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
@@ -1407,6 +1409,8 @@
 
 %patch1001 -p1
 
+%patch0011 -p1
+
 find -type d -name "helpdocs" -exec rm -rvf {} \; 2>/dev/null || :
 
 rm -rf plugins/kolab_zpush
@@ -2792,6 +2796,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Mar 27 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.3-2
+- Fix invalid time error on formats without a leading zero
+
 * Thu Mar 14 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.3-1
 - Release of version 3.4.3

0011-Calendar-Fix-invalid-time-error-when-using-time-form.patch Added

@@ -0,0 +1,26 @@
+From 54d171e10f0d116d3fd007189805ed49923a003a Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Fri, 22 Mar 2019 12:22:10 +0000
+Subject: [PATCH 11/11] Calendar: Fix "invalid time" error when using time
+ format without a leading zero
+
+---
+ plugins/calendar/calendar_ui.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
+index 0280ccec..6db0ad79 100644
+--- a/plugins/calendar/calendar_ui.js
++++ b/plugins/calendar/calendar_ui.js
+@@ -812,7 +812,7 @@ function rcube_calendar_ui(settings)
+         save_func = function() {
+           var start = allday.checked ? '12:00' : $.trim(starttime.val()),
+             end = allday.checked ? '13:00' : $.trim(endtime.val()),
+-            re = /^((0[0-9])|(1[0-9])|(2[0-3])):([0-5][0-9])(\s*[ap]\.?m\.?)?$/i;
++            re = /^((0?[0-9])|(1[0-9])|(2[0-3])):([0-5][0-9])(\s*[ap]\.?m\.?)?$/i;
+ 
+           if (!re.test(start) || !re.test(end)) {
+             rcmail.alert_dialog(rcmail.gettext('invalideventdates', 'calendar'));
+-- 
+2.17.2
+

debian.changelog Changed

debian.series Changed

roundcubemail-plugins-kolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2441 0

Request History

vanmeeuwen created request over 5 years ago

Fix invalid time error

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago