Request 2664 (accepted)

Overview

Request 2664 (accepted)

Check in 3.5.3

Created by vanmeeuwen almost 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

debian.changelog Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/calendar/README -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/calendar/README Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/calendar/calendar_ui.js -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/calendar/calendar_ui.js Changed

@@ -563,6 +563,11 @@
         }
       });
 
+      var close_func = function(e) {
+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
+          $('.libcal-rsvp-replymode').hide();
+        };
+
       // open jquery UI dialog
       $dialog.dialog({
         modal: true,
@@ -575,21 +580,12 @@
             $dialog.parent().find('button:not(.ui-dialog-titlebar-close,.delete)').first().focus();
           }, 5);
         },
-        beforeClose: function(e) {
-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
-        },
         close: function(e) {
-          $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-          $('.libcal-rsvp-replymode').hide();
-        },
-        dragStart: function(e) {
-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
-          $('.libcal-rsvp-replymode').hide();
-        },
-        resizeStart: function(e) {
-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
-          $('.libcal-rsvp-replymode').hide();
+          close_func(e);
+          $dialog.dialog('close');
         },
+        dragStart: close_func,
+        resizeStart: close_func,
         buttons: buttons,
         minWidth: 320,
         width: 420
@@ -611,12 +607,12 @@
           .attr({href: '#', 'class': 'dropdown-link btn btn-link options', 'data-popup-pos': 'top'})
           .text(rcmail.gettext('eventoptions','calendar'))
           .click(function(e) {
-            return rcmail.command('menu-open','eventoptionsmenu', this, e)
+            return rcmail.command('menu-open','eventoptionsmenu', this, e);
           })
           .appendTo($dialog.parent().find('.ui-dialog-buttonset'));
       }
 
-      rcmail.enable_command('event-history', calendar.history)
+      rcmail.enable_command('event-history', calendar.history);
 
       rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
     };
@@ -626,12 +622,14 @@
     {
       var cutype = $(this).attr('data-cutype'),
         mailto = this.href.substr(7);
+
       if (rcmail.env.calendar_resources && cutype == 'RESOURCE') {
         event_resources_dialog(mailto);
       }
       else {
         rcmail.command('compose', mailto, e ? e.target : null, e);
       }
+
       return false;
     };
 
@@ -3179,9 +3177,9 @@
           if (v.role != 'ORGANIZER') {
             v.status = 'NEEDS-ACTION';
           }
-        })
+        });
 
-        event_edit_dialog('new', copy);
+        setTimeout(function() { event_edit_dialog('new', copy); }, 50);
       }
     };

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/calendar/composer.json -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/calendar/composer.json Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/calendar/drivers/database/SQL/sqlite/2013051600.sql -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/calendar/drivers/database/SQL/sqlite/2013051600.sql Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/calendar/drivers/database/SQL/sqlite/2014040900.sql -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/calendar/drivers/database/SQL/sqlite/2014040900.sql Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/kolab_auth/composer.json -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/kolab_auth/composer.json Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/kolab_auth/kolab_auth.php -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/kolab_auth/kolab_auth.php Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/kolab_sso/drivers/oauth2.php -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/kolab_sso/drivers/oauth2.php Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/libkolab/composer.json -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/libkolab/composer.json Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/libkolab/config.inc.php.dist -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/libkolab/config.inc.php.dist Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php Changed

@@ -203,7 +203,7 @@
                 for ($i=0; $i < $byday->size(); $i++) {
                     $daypos = $byday->get($i);
                     $prefix = $daypos->occurence();
-                    $weekdays[] = ($prefix ? $prefix : '') . $weekday_map[$daypos->weekday()];
+                    $weekdays[] = ($prefix ?: '') . $weekday_map[$daypos->weekday()];
                 }
                 $object['recurrence']['BYDAY'] = join(',', $weekdays);
             }
@@ -382,8 +382,8 @@
                 $att = new Attendee;
                 $att->setContact($cr);
                 $att->setPartStat($this->part_status_map[$attendee['status']]);
-                $att->setRole($this->role_map[$attendee['role']] ? $this->role_map[$attendee['role']] : kolabformat::Required);
-                $att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);
+                $att->setRole($this->role_map[$attendee['role']] ?: kolabformat::Required);
+                $att->setCutype($this->cutype_map[$attendee['cutype']] ?: kolabformat::CutypeIndividual);
                 $att->setRSVP((bool)$attendee['rsvp']);
 
                 if (!empty($attendee['delegated-from'])) {

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/libkolab/lib/kolab_storage.php -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/libkolab/lib/kolab_storage.php Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/tasklist/README -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/tasklist/README Changed

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/tasklist/composer.json -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/tasklist/composer.json Changed

roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/tasklist/drivers/database/SQL/sqlite.initial.sql Added

@@ -0,0 +1,51 @@
+/**
+ * Roundcube Tasklist plugin database
+ *
+ * @author Thomas Bruederli
+ * @licence GNU AGPL
+ * @copyright (C) 2014, Kolab Systems AG
+ */
+
+CREATE TABLE tasklists (
+    tasklist_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL,
+    name varchar(255) NOT NULL,
+    color varchar(8) NOT NULL,
+    showalarms tinyint NOT NULL DEFAULT '0',
+    CONSTRAINT fk_tasklists_user_id FOREIGN KEY (user_id)
+        REFERENCES users (user_id) ON UPDATE CASCADE ON DELETE CASCADE
+);
+
+CREATE INDEX ix_tasklists_user_id ON tasklists (user_id, name);
+
+CREATE TABLE tasks (
+    task_id integer NOT NULL PRIMARY KEY,
+    tasklist_id integer NOT NULL,
+    parent_id integer DEFAULT NULL,
+    uid varchar(255) NOT NULL,
+    created datetime NOT NULL DEFAULT (datetime('now', 'localtime')),
+    changed datetime NOT NULL DEFAULT (datetime('now', 'localtime')),
+    del tinyint NOT NULL DEFAULT '0',
+    title varchar(255) NOT NULL,
+    description text,
+    tags text,
+    "date" varchar(10) DEFAULT NULL,
+    "time" varchar(5) DEFAULT NULL,
+    startdate varchar(10) DEFAULT NULL,
+    starttime varchar(5) DEFAULT NULL,
+    flagged tinyint NOT NULL DEFAULT '0',
+    complete real NOT NULL DEFAULT '0',
+    status varchar(16) NOT NULL DEFAULT '',
+    alarms varchar(255) DEFAULT NULL,
+    recurrence varchar(255) DEFAULT NULL,
+    organizer varchar(255) DEFAULT NULL,
+    attendees text,
+    notify datetime DEFAULT NULL,
+    CONSTRAINT fk_tasks_tasklist_id FOREIGN KEY (tasklist_id)
+        REFERENCES tasklists (tasklist_id) ON UPDATE CASCADE ON DELETE CASCADE
+);
+
+CREATE INDEX ix_tasks_tasklisting ON tasks (tasklist_id, del, date);
+CREATE INDEX ix_tasks_uid ON tasks (uid);
+
+INSERT INTO system (name, value) VALUES ('tasklist-database-version', '2014051900');

roundcubemail-plugins-kolab-3.5.2.tar.gz/plugins/tasklist/drivers/database/tasklist_database_driver.php -> roundcubemail-plugins-kolab-3.5.3.tar.gz/plugins/tasklist/drivers/database/tasklist_database_driver.php Changed

@@ -332,7 +332,7 @@
             foreach (array('title', 'description', 'organizer', 'attendees') as $col) {
                 $sql_query[] = $this->rc->db->ilike($col, '%' . $filter['search'] . '%');
             }
-            $sql_add = "AND (" . join(" OR ", $sql_query) . ")";
+            $sql_add = " AND (" . join(" OR ", $sql_query) . ")";
         }
 
         if ($filter['since'] && is_numeric($filter['since'])) {
@@ -421,7 +421,7 @@
                 "SELECT `task_id` AS id FROM " . $this->db_tasks
                 . " WHERE `tasklist_id` IN (" . $this->list_ids . ")"
                     . " AND `parent_id` IN (" . join(',', array_map(array($this->rc->db, 'quote'), $task_ids)) . ")"
-                    . " AND `del` = 0",
+                    . " AND `del` = 0"
             );
 
             $task_ids = array();
@@ -470,7 +470,7 @@
             $result = $this->rc->db->query("SELECT * FROM " . $this->db_tasks
                 . " WHERE `tasklist_id` IN (" . join(',', $list_ids) . ")"
                     . " AND `notify` <= " . $this->rc->db->fromunixtime($time)
-                    . " AND NOT " . self::IS_COMPLETE_SQL,
+                    . " AND NOT " . self::IS_COMPLETE_SQL
             );
 
             while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
@@ -597,7 +597,7 @@
             strval($prop['description']),
             join(',', (array)$prop['tags']),
             $prop['flagged'] ? 1 : 0,
-            $prop['complete'],
+            $prop['complete'] ?: 0,
             strval($prop['status']),
             $prop['alarms'],
             $prop['recurrence'],

roundcubemail-plugins-kolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2664 0

Request History

vanmeeuwen created request almost 5 years ago

Check in 3.5.3

vanmeeuwen accepted review almost 5 years ago

vanmeeuwen approved review almost 5 years ago

vanmeeuwen accepted request almost 5 years ago