Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

2017-12-19 13:57:35 +02:00
parent 87f1a84e0d f6f2010670
commit 2a2e7524e8
1 changed files with 5 additions and 1 deletions
@@ -65,7 +65,11 @@ Espo.define('views/admin/index', 'view', function (Dep) {
                'css=' + encodeURIComponent(this.getConfig().get('siteUrl') + '/' + this.getThemeManager().getStylesheet())
            ];
            this.iframeUrl = this.getConfig().get('adminPanelIframeUrl') || 'https://s.espocrm.com/';
-            this.iframeUrl += '?' + iframeParams.join('&');
+            if (~this.iframeUrl.indexOf('?')) {
+                this.iframeUrl += '&' + iframeParams.join('&');
+            } else {
+                this.iframeUrl += '?' + iframeParams.join('&');
+            }

            if (!this.getConfig().get('adminNotificationsDisabled')) {
                this.createView('notificationsPanel', 'views/admin/panels/notifications', {