Merge remote-tracking branch 'origin/hotfix-4966'

open-xchange · Nov 20, 2018 · dd1ac0e · dd1ac0e
2 parents 115eba0 + 1cfec7d
commit dd1ac0e
Show file tree

Hide file tree

Showing 38 changed files with 298 additions and 156 deletions.
diff --git a/guidedtours/package.json b/guidedtours/package.json
@@ -1,6 +1,6 @@
 {
   "name": "open-xchange-guidedtours",
-  "version": "7.10.0-18",
+  "version": "7.10.0-19",
   "repository": {
     "type": "git",
     "url": "https://code.open-xchange.com/git/wd/frontend/web"

diff --git a/help/package.json b/help/package.json
@@ -1,6 +1,6 @@
 {
   "name": "open-xchange-appsuite-help",
-  "version": "7.10.0-18",
+  "version": "7.10.0-19",
   "description": "App Suite UI Help",
   "repository": {
     "type": "git",

diff --git a/open-xchange-appsuite-help/debian/changelog b/open-xchange-appsuite-help/debian/changelog
@@ -1,3 +1,9 @@
+open-xchange-appsuite-help (7.10.0-19) stable; urgency=medium
+
+  * Build for patch 2018-11-19 (4966)
+
+ -- Marcus Klein <marcus.klein@open-xchange.com>  Mon, 12 Nov 2018 16:32:55 +0000
+
 open-xchange-appsuite-help (7.10.0-18) stable; urgency=medium
 
   * Build for patch 2018-11-05 (4933)

diff --git a/open-xchange-appsuite-help/open-xchange-appsuite-help.spec b/open-xchange-appsuite-help/open-xchange-appsuite-help.spec
@@ -17,7 +17,7 @@ BuildRequires:  npm6
 BuildRequires:  nodejs >= 0.10.0
 %endif
 Version:        @OXVERSION@
-%define         ox_release 18
+%define         ox_release 19
 Release:        %{ox_release}_<CI_CNT>.<B_CNT>
 Group:          Applications/Productivity
 Vendor:         Open-Xchange
@@ -262,6 +262,8 @@ done
 %{docroot}/appsuite/help/l10n/zh_TW
 
 %changelog
+* Mon Nov 12 2018 Marcus Klein <marcus.klein@open-xchange.com>
+Build for patch 2018-11-19 (4966)
 * Mon Oct 29 2018 Marcus Klein <marcus.klein@open-xchange.com>
 Build for patch 2018-11-05 (4933)
 * Fri Oct 19 2018 Marcus Klein <marcus.klein@open-xchange.com>

diff --git a/open-xchange-appsuite-saml/debian/changelog b/open-xchange-appsuite-saml/debian/changelog
@@ -1,3 +1,9 @@
+open-xchange-appsuite-saml (7.10.0-19) stable; urgency=medium
+
+  * Build for patch 2018-11-19 (4966)
+
+ -- Markus Wagner <markus.wagner@open-xchange.com>  Mon, 12 Nov 2018 16:33:50 +0000
+
 open-xchange-appsuite-saml (7.10.0-18) stable; urgency=medium
 
   * Build for patch 2018-11-05 (4933)

diff --git a/open-xchange-appsuite-saml/open-xchange-appsuite-saml.spec b/open-xchange-appsuite-saml/open-xchange-appsuite-saml.spec
@@ -1,6 +1,6 @@
 Name:           open-xchange-appsuite-saml
 Version:        @OXVERSION@
-%define         ox_release 18
+%define         ox_release 19
 Release:        %{ox_release}_<CI_CNT>.<B_CNT>
 Group:          Applications/Productivity
 Packager:       Francisco Laguna <francisco.laguna@open-xchange.com>
@@ -58,6 +58,8 @@ if [ -x %{update} ]; then %{update} --later; fi
 /opt/open-xchange/appsuite
 
 %changelog
+* Mon Nov 12 2018 Markus Wagner <markus.wagner@open-xchange.com>
+Build for patch 2018-11-19 (4966)
 * Mon Oct 29 2018 Markus Wagner <markus.wagner@open-xchange.com>
 Build for patch 2018-11-05 (4933)
 * Fri Oct 19 2018 Markus Wagner <markus.wagner@open-xchange.com>

diff --git a/open-xchange-appsuite-saml/package.json b/open-xchange-appsuite-saml/package.json
@@ -1,6 +1,6 @@
 {
   "name": "open-xchange-appsuite-saml",
-  "version": "7.10.0-18",
+  "version": "7.10.0-19",
   "description": "App Suite UI SAML",
   "repository": {
     "type": "git",

diff --git a/open-xchange-appsuite-spamexperts/debian/changelog b/open-xchange-appsuite-spamexperts/debian/changelog
@@ -1,3 +1,9 @@
+open-xchange-appsuite-spamexperts (7.10.0-19) stable; urgency=medium
+
+  * Build for patch 2018-11-19 (4966)
+
+ -- Viktor Pracht <viktor.pracht@open-xchange.com>  Mon, 12 Nov 2018 16:34:40 +0000
+
 open-xchange-appsuite-spamexperts (7.10.0-18) stable; urgency=medium
 
   * Build for patch 2018-11-05 (4933)

diff --git a/open-xchange-appsuite-spamexperts/open-xchange-appsuite-spamexperts.spec b/open-xchange-appsuite-spamexperts/open-xchange-appsuite-spamexperts.spec
@@ -1,6 +1,6 @@
 Name:           open-xchange-appsuite-spamexperts
 Version:        @OXVERSION@
-%define         ox_release 18
+%define         ox_release 19
 Release:        %{ox_release}_<CI_CNT>.<B_CNT>
 Group:          Applications/Productivity
 Packager:       Viktor Pracht <viktor.pracht@open-xchange.com>
@@ -99,6 +99,8 @@ if [ -x %{update} ]; then %{update} --later; fi
 #%{docroot}
 
 %changelog
+* Mon Nov 12 2018 Viktor Pracht <viktor.pracht@open-xchange.com>
+Build for patch 2018-11-19 (4966)
 * Mon Oct 29 2018 Viktor Pracht <viktor.pracht@open-xchange.com>
 Build for patch 2018-11-05 (4933)
 * Fri Oct 19 2018 Viktor Pracht <viktor.pracht@open-xchange.com>

diff --git a/open-xchange-appsuite-spamexperts/package.json b/open-xchange-appsuite-spamexperts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "open-xchange-appsuite-spamexperts",
-  "version": "7.10.0-18",
+  "version": "7.10.0-19",
   "repository": {
     "type": "git",
     "url": "https://code.open-xchange.com/git/wd/frontend/web"

diff --git a/open-xchange-appsuite/debian/changelog b/open-xchange-appsuite/debian/changelog
@@ -1,3 +1,9 @@
+open-xchange-appsuite (7.10.0-19) stable; urgency=medium
+
+  * Build for patch 2018-11-19 (4966)
+
+ -- Markus Wagner <markus.wagner@open-xchange.com>  Mon, 12 Nov 2018 16:30:08 +0000
+
 open-xchange-appsuite (7.10.0-18) stable; urgency=medium
 
   * Build for patch 2018-11-05 (4933)

diff --git a/open-xchange-appsuite/open-xchange-appsuite.spec b/open-xchange-appsuite/open-xchange-appsuite.spec
@@ -17,7 +17,7 @@ BuildRequires:  npm6
 BuildRequires:  nodejs >= 0.10.0
 %endif
 Version:        @OXVERSION@
-%define         ox_release 18
+%define         ox_release 19
 Release:        %{ox_release}_<CI_CNT>.<B_CNT>
 Group:          Applications/Productivity
 Vendor:         Open-Xchange
@@ -607,6 +607,8 @@ if [ -x %{update} ]; then %{update}; fi
 /opt/open-xchange/etc/languages/appsuite/open-xchange-appsuite-l10n-zh-tw.properties
 
 %changelog
+* Mon Nov 12 2018 Markus Wagner <markus.wagner@open-xchange.com>
+Build for patch 2018-11-19 (4966)
 * Mon Oct 29 2018 Markus Wagner <markus.wagner@open-xchange.com>
 Build for patch 2018-11-05 (4933)
 * Fri Oct 19 2018 Markus Wagner <markus.wagner@open-xchange.com>

diff --git a/open-xchange-dynamic-theme/debian/changelog b/open-xchange-dynamic-theme/debian/changelog
@@ -1,3 +1,9 @@
+open-xchange-dynamic-theme (7.10.0-19) stable; urgency=medium
+
+  * Build for patch 2018-11-19 (4966)
+
+ -- Viktor Pracht <viktor.pracht@open-xchange.com>  Mon, 12 Nov 2018 16:35:33 +0000
+
 open-xchange-dynamic-theme (7.10.0-18) stable; urgency=medium
 
   * Build for patch 2018-11-05 (4933)

diff --git a/open-xchange-dynamic-theme/open-xchange-dynamic-theme.spec b/open-xchange-dynamic-theme/open-xchange-dynamic-theme.spec
@@ -1,6 +1,6 @@
 Name:           open-xchange-dynamic-theme
 Version:        @OXVERSION@
-%define         ox_release 18
+%define         ox_release 19
 Release:        %{ox_release}_<CI_CNT>.<B_CNT>
 Group:          Applications/Productivity
 Packager:       Viktor Pracht <viktor.pracht@open-xchange.com>
@@ -67,6 +67,8 @@ if [ -x %{update} ]; then %{update} --later; fi
 %config(noreplace) /opt/open-xchange/etc/settings/open-xchange-dynamic-theme.properties
 
 %changelog
+* Mon Nov 12 2018 Viktor Pracht <viktor.pracht@open-xchange.com>
+Build for patch 2018-11-19 (4966)
 * Mon Oct 29 2018 Viktor Pracht <viktor.pracht@open-xchange.com>
 Build for patch 2018-11-05 (4933)
 * Fri Oct 19 2018 Viktor Pracht <viktor.pracht@open-xchange.com>

diff --git a/open-xchange-dynamic-theme/package.json b/open-xchange-dynamic-theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "open-xchange-dynamic-theme",
-  "version": "7.10.0-18",
+  "version": "7.10.0-19",
   "description": "App Suite UI Dynamic Theme",
   "scripts": {
     "debug": "grunt clean default && rm -rf ../ui/build/apps/io.ox/dynamic-theme && cp -r build ../ui/ && cd ../ui/build && node --inspect-brk ../../open-xchange-dynamic-theme/lib/update-dynamic-theme.js -v -v",

diff --git a/open-xchange-guidedtours/debian/changelog b/open-xchange-guidedtours/debian/changelog
@@ -1,3 +1,9 @@
+open-xchange-guidedtours (7.10.0-19) stable; urgency=medium
+
+  * Build for patch 2018-11-19 (4966)
+
+ -- Marcus Klein <marcus.klein@open-xchange.com>  Mon, 12 Nov 2018 16:36:33 +0000
+
 open-xchange-guidedtours (7.10.0-18) stable; urgency=medium
 
   * Build for patch 2018-11-05 (4933)

diff --git a/open-xchange-guidedtours/open-xchange-guidedtours.spec b/open-xchange-guidedtours/open-xchange-guidedtours.spec
@@ -17,7 +17,7 @@ BuildRequires:  npm6
 BuildRequires:  nodejs >= 0.10.0
 %endif
 Version:        @OXVERSION@
-%define         ox_release 18
+%define         ox_release 19
 Release:        %{ox_release}_<CI_CNT>.<B_CNT>
 Group:          Applications/Productivity
 Vendor:         Open-Xchange
@@ -60,6 +60,8 @@ ant -Dbasedir=build -DdestDir=%{buildroot} -DpackageName=%{name} -DkeepCache=tru
 /opt/open-xchange/etc/settings/guidedtours.properties
 
 %changelog
+* Mon Nov 12 2018 Marcus Klein <marcus.klein@open-xchange.com>
+Build for patch 2018-11-19 (4966)
 * Mon Oct 29 2018 Marcus Klein <marcus.klein@open-xchange.com>
 Build for patch 2018-11-05 (4933)
 * Fri Oct 19 2018 Marcus Klein <marcus.klein@open-xchange.com>

diff --git a/ui/apps/io.ox/calendar/main.js b/ui/apps/io.ox/calendar/main.js
@@ -760,34 +760,12 @@ define('io.ox/calendar/main', [
 
         'metrics': function (app) {
 
+            // hint: toolbar metrics are registery by extension 'metrics-toolbar'
             require(['io.ox/metrics/main'], function (metrics) {
                 if (!metrics.isEnabled()) return;
 
                 var nodes = app.getWindow().nodes,
-                    toolbar = nodes.body.find('.classic-toolbar-container'),
                     sidepanel = nodes.sidepanel;
-                // toolbar actions
-                toolbar.on('mousedown', '.io-ox-action-link:not(.dropdown-toggle)', function (e) {
-                    metrics.trackEvent({
-                        app: 'calendar',
-                        target: 'toolbar',
-                        type: 'click',
-                        action: $(e.currentTarget).attr('data-action')
-                    });
-                });
-                // toolbar options dropdown
-                toolbar.on('mousedown', '.dropdown a:not(.io-ox-action-link)', function (e) {
-                    var node =  $(e.target).closest('a'),
-                        isToggle = node.attr('data-toggle') === 'true';
-                    if (!node.attr('data-name')) return;
-                    metrics.trackEvent({
-                        app: 'calendar',
-                        target: 'toolbar',
-                        type: 'click',
-                        action: node.attr('data-action') || node.attr('data-name'),
-                        detail: isToggle ? !node.find('.fa-check').length : node.attr('data-value')
-                    });
-                });
                 // listview toolbar toolbar
                 nodes.main.on('mousedown', '.calendar-list-view .toolbar.top a a[data-name], .calendar-list-view .toolbar.top a a[data-action]', function (e) {
                     var node = $(e.currentTarget);

diff --git a/ui/apps/io.ox/calendar/toolbar.js b/ui/apps/io.ox/calendar/toolbar.js
@@ -293,4 +293,41 @@ define('io.ox/calendar/toolbar', [
             });
         }
     });
+
+    ext.point('io.ox/calendar/mediator').extend({
+        id: 'metrics-toolbar',
+        index: 10300,
+        setup: function (app) {
+
+            require(['io.ox/metrics/main'], function (metrics) {
+                if (!metrics.isEnabled()) return;
+
+                var nodes = app.getWindow().nodes,
+                    toolbar = nodes.body.find('.classic-toolbar-container');
+
+                // toolbar actions
+                toolbar.on('mousedown', '.io-ox-action-link:not(.dropdown-toggle)', function (e) {
+                    metrics.trackEvent({
+                        app: 'calendar',
+                        target: 'toolbar',
+                        type: 'click',
+                        action: $(e.currentTarget).attr('data-action')
+                    });
+                });
+                // toolbar options dropdown
+                toolbar.on('mousedown', '.dropdown a:not(.io-ox-action-link)', function (e) {
+                    var node =  $(e.target).closest('a'),
+                        isToggle = node.attr('data-toggle') === 'true';
+                    if (!node.attr('data-name')) return;
+                    metrics.trackEvent({
+                        app: 'calendar',
+                        target: 'toolbar',
+                        type: 'click',
+                        action: node.attr('data-action') || node.attr('data-name'),
+                        detail: isToggle ? !node.find('.fa-check').length : node.attr('data-value')
+                    });
+                });
+            });
+        }
+    });
 });
diff --git a/ui/apps/io.ox/contacts/main.js b/ui/apps/io.ox/contacts/main.js
@@ -891,34 +891,13 @@ define('io.ox/contacts/main', [
 
         'metrics': function (app) {
 
+            // hint: toolbar metrics are registery by extension 'metrics-toolbar'
             require(['io.ox/metrics/main'], function (metrics) {
                 if (!metrics.isEnabled()) return;
 
                 var nodes = app.getWindow().nodes,
-                    toolbar = nodes.body.find('.classic-toolbar-container'),
                     sidepanel = nodes.sidepanel;
-                // toolbar actions
-                toolbar.on('mousedown', '.io-ox-action-link:not(.dropdown-toggle)', function (e) {
-                    metrics.trackEvent({
-                        app: 'contacts',
-                        target: 'toolbar',
-                        type: 'click',
-                        action: $(e.currentTarget).attr('data-action')
-                    });
-                });
-                // toolbar options dropdown
-                toolbar.on('mousedown', '.dropdown a:not(.io-ox-action-link)', function (e) {
-                    var node =  $(e.target).closest('a'),
-                        isToggle = node.attr('data-toggle') === 'true';
-                    if (!node.attr('data-name')) return;
-                    metrics.trackEvent({
-                        app: 'contacts',
-                        target: 'toolbar',
-                        type: 'click',
-                        action: node.attr('data-action') || node.attr('data-name'),
-                        detail: isToggle ? !node.find('.fa-check').length : node.attr('data-value')
-                    });
-                });
+
                 // vgrid toolbar
                 nodes.main.find('.vgrid-toolbar').on('mousedown', 'a[data-name], a[data-action]', function (e) {
                     var node = $(e.currentTarget);

diff --git a/ui/apps/io.ox/contacts/toolbar.js b/ui/apps/io.ox/contacts/toolbar.js
@@ -224,4 +224,41 @@ define('io.ox/contacts/toolbar', [
         }
     });
 
+    ext.point('io.ox/contacts/mediator').extend({
+        id: 'metrics-toolbar',
+        index: 10300,
+        setup: function (app) {
+
+            require(['io.ox/metrics/main'], function (metrics) {
+                if (!metrics.isEnabled()) return;
+
+                var nodes = app.getWindow().nodes,
+                    toolbar = nodes.body.find('.classic-toolbar-container');
+
+                // toolbar actions
+                toolbar.on('mousedown', '.io-ox-action-link:not(.dropdown-toggle)', function (e) {
+                    metrics.trackEvent({
+                        app: 'contacts',
+                        target: 'toolbar',
+                        type: 'click',
+                        action: $(e.currentTarget).attr('data-action')
+                    });
+                });
+                // toolbar options dropdown
+                toolbar.on('mousedown', '.dropdown a:not(.io-ox-action-link)', function (e) {
+                    var node =  $(e.target).closest('a'),
+                        isToggle = node.attr('data-toggle') === 'true';
+                    if (!node.attr('data-name')) return;
+                    metrics.trackEvent({
+                        app: 'contacts',
+                        target: 'toolbar',
+                        type: 'click',
+                        action: node.attr('data-action') || node.attr('data-name'),
+                        detail: isToggle ? !node.find('.fa-check').length : node.attr('data-value')
+                    });
+                });
+            });
+        }
+    });
+
 });
diff --git a/ui/apps/io.ox/core/desktop.js b/ui/apps/io.ox/core/desktop.js
@@ -762,7 +762,7 @@ define('io.ox/core/desktop', [
         },
 
         removeRestorePoint: function (id) {
-            var self =  this;
+            var self = this;
             return this.getSavePoints().then(function (list) {
                 list = list || [];
                 var ids = _(list).pluck('id'),
@@ -816,10 +816,7 @@ define('io.ox/core/desktop', [
                                         app.launch({ floatingWindowModel: model }).then(function () {
                                             // update unique id
                                             obj.id = this.get('uniqueID');
-                                            if (this.failRestore) {
-                                                // restore
-                                                return this.failRestore(obj.point);
-                                            }
+                                            if (this.failRestore) return this.failRestore(obj.point);
                                             return $.when();
                                         }).done(function () {
                                             // replace restore point with old id with restore point with new id (prevents duplicates)
@@ -828,6 +825,13 @@ define('io.ox/core/desktop', [
                                                 self.setSavePoints(sp);
                                                 if (model.get('quitAfterLaunch')) model.trigger('quit');
                                             });
+                                        }).fail(function (e) {
+                                            if (!e || e.code !== 'MSG-0032') return;
+                                            // restoreById-savepoint after draft got deleted
+                                            _.delay(function () {
+                                                ox.ui.App.removeRestorePoint(oldId);
+                                                model.trigger('close');
+                                            });
                                         });
                                         return;
                                     }