Request 2442 (accepted)

Overview

Request 2442 (accepted)

Two more fixes

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

@@ -63,6 +63,8 @@
 
 Patch1001:      roundcubemail-plugins-kolab-3.4-kolab-files-manticore-api.patch
 
+Patch0002:      0002-Calendar-Fix-regression-where-changing-attendee-stat.patch
+Patch0006:      0006-Calendar-Fix-literal-raquo-in-calendar-name-in-event.patch
 Patch0011:      0011-Calendar-Fix-invalid-time-error-when-using-time-form.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -1409,6 +1411,8 @@
 
 %patch1001 -p1
 
+%patch0002 -p1
+%patch0006 -p1
 %patch0011 -p1
 
 find -type d -name "helpdocs" -exec rm -rvf {} \; 2>/dev/null || :
@@ -2796,7 +2800,9 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Mar 27 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.3-2
+* Thu Mar 28 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4.3-3
+- Fix literal in calendar name event
+- Fix calendar event attendee change regression
 - 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

0002-Calendar-Fix-regression-where-changing-attendee-stat.patch Added

@@ -0,0 +1,89 @@
+From a71caa9a51ef83a5673005fa792f2d671a47fcae Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Thu, 14 Mar 2019 15:08:53 +0000
+Subject: [PATCH 02/11] Calendar: Fix regression where changing attendee status
+ for an existing event wasn't working
+
+Also fixed bug where allday event accourrence could have been moved
+one day back when changing the attendee status (action=rsvp).
+---
+ plugins/calendar/calendar_ui.js               |  9 ++++++-
+ .../libkolab/lib/kolab_date_recurrence.php    | 26 ++++++++++++++++++-
+ 2 files changed, 33 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
+index 812bf492..20f6cf41 100644
+--- a/plugins/calendar/calendar_ui.js
++++ b/plugins/calendar/calendar_ui.js
+@@ -2446,9 +2446,16 @@ function rcube_calendar_ui(settings)
+         }
+ 
+         // submit status change to server
+-        var submit_data = $.extend({}, me.selected_event, { source:null, comment:$('#reply-comment-event-rsvp').val(), _savemode: replymode || 'all' }, (delegate || {})),
++        var submit_data = $.extend({}, { source:null, comment:$('#reply-comment-event-rsvp').val(), _savemode: replymode || 'all' }, (delegate || {})),
++          submit_items = 'id,uid,_instance,calendar,_mbox,_uid,_part,attendees,free_busy,allDay',
+           noreply = $('#noreply-event-rsvp:checked').length ? 1 : 0;
+ 
++        // Submit only that data we really need
++        $.each(submit_items.split(','), function() {
++          if (this in me.selected_event)
++            submit_data[this] = me.selected_event[this];
++        });
++
+         // import event from mail (temporary iTip event)
+         if (submit_data._mbox && submit_data._uid) {
+           me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
+diff --git a/plugins/libkolab/lib/kolab_date_recurrence.php b/plugins/libkolab/lib/kolab_date_recurrence.php
+index 2ec06c8a..5ab4532e 100644
+--- a/plugins/libkolab/lib/kolab_date_recurrence.php
++++ b/plugins/libkolab/lib/kolab_date_recurrence.php
+@@ -32,6 +32,9 @@ class kolab_date_recurrence
+     private /* DateTime */ $next;
+     private /* cDateTime */ $cnext;
+     private /* DateInterval */ $duration;
++    private /* string */ $start_time;
++    private /* string */ $end_time;
++
+ 
+     /**
+      * Default constructor
+@@ -47,6 +50,13 @@ class kolab_date_recurrence
+         $this->start  = $this->next = $data['start'];
+         $this->cnext  = kolab_format::get_datetime($this->next);
+ 
++        if ($this->start && !empty($data['allday'])) {
++            $this->start_time = $data['start']->format('H:i:s');
++            if ($data['end']) {
++                $this->end_time = $data['end']->format('H:i:s');
++            }
++        }
++
+         if (is_object($data['start']) && is_object($data['end'])) {
+             $this->duration = $data['start']->diff($data['end']);
+         }
+@@ -91,7 +101,21 @@ class kolab_date_recurrence
+             $next_end = clone $next_start;
+             $next_end->add($this->duration);
+ 
+-            $next          = $this->object->to_array();
++            $next = $this->object->to_array();
++
++            // it looks that for allday events the occurrence time
++            // is reset to 00:00:00, this is causing various issues
++            if (!empty($next['allday'])) {
++                if ($this->start_time) {
++                    $time = explode(':', $this->start_time);
++                    $next_start->setTime((int)$time[0], (int)$time[1], (int)$time[2]);
++                }
++                if ($this->start_end) {
++                    $time = explode(':', $this->start_end);
++                    $next_end->setTime((int)$time[0], (int)$time[1], (int)$time[2]);
++                }
++            }
++
+             $next['start'] = $next_start;
+             $next['end']   = $next_end;
+ 
+-- 
+2.20.1
+

0006-Calendar-Fix-literal-raquo-in-calendar-name-in-event.patch Added

@@ -0,0 +1,26 @@
+From bd62884ea230d8816b545282ac6ed7eee43fbab5 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Mon, 18 Mar 2019 15:32:35 +0000
+Subject: [PATCH 06/11] Calendar: Fix literal "&raquo;" in calendar name in
+ event dialog
+
+---
+ 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 20f6cf41..0280ccec 100644
+--- a/plugins/calendar/calendar_ui.js
++++ b/plugins/calendar/calendar_ui.js
+@@ -397,7 +397,7 @@ function rcube_calendar_ui(settings)
+       if (event.valarms && event.alarms_text)
+         $('#event-alarm').show().find('.event-text').html(Q(event.alarms_text).replace(',', ',<br>'));
+       if (calendar.name)
+-        $('#event-calendar').show().find('.event-text').text(calendar.name).addClass('cal-'+calendar.id);
++        $('#event-calendar').show().find('.event-text').html(Q(calendar.name)).addClass('cal-'+calendar.id);
+       if (event.categories)
+         $('#event-category').show().find('.event-text').text(event.categories).addClass('cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
+       if (event.free_busy)
+-- 
+2.20.1
+

debian.changelog Changed

debian.series Changed

roundcubemail-plugins-kolab.dsc Changed

@@ -2,7 +2,7 @@
 Source: roundcubemail-plugins-kolab
 Binary: roundcubemail-plugins-kolab
 Architecture: all
-Version: 1:3.4.3-0~kolab2
+Version: 1:3.4.3-0~kolab3
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
 Standards-Version: 3.9.3
@@ -15,6 +15,7 @@
  roundcubemail-plugin-kolab-activesync deb web extra
  roundcubemail-plugin-kolab-addressbook deb web extra
  roundcubemail-plugin-kolab-auth deb web extra
+ roundcubemail-plugin-kolab-auth-proxy deb web extra
  roundcubemail-plugin-kolab-chat deb web extra
  roundcubemail-plugin-kolab-config deb web extra
  roundcubemail-plugin-kolab-delegation deb web extra
@@ -22,6 +23,7 @@
  roundcubemail-plugin-kolab-folders deb web extra
  roundcubemail-plugin-kolab-notes deb web extra
  roundcubemail-plugin-kolab-shortcuts deb web extra
+ roundcubemail-plugin-kolab-sso deb web extra
  roundcubemail-plugin-kolab-tags deb web extra
  roundcubemail-plugin-ldap-authentication deb web extra
  roundcubemail-plugin-libcalendaring deb web extra

Build Results
RPM Lint

Refresh

Comments for request 2442 0

Request History

vanmeeuwen created request over 5 years ago

Two more fixes

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago