Merge branch 'hotfix/5.0.3'

application/Espo/Modules/Crm/Resources/layouts/KnowledgeBaseArticle/relationshipsPortal.json

@@ -0,0 +1 @@
+[]

application/Espo/Modules/Crm/Resources/metadata/app/jsLibs.json

@@ -6,6 +6,7 @@
     },
     "vis": {
         "path": "client/modules/crm/lib/vis.min.js",
-        "exportsAs": "vis"
+        "exportsAs": "vis",
+        "noAppCache": true
     }
 }

application/Espo/Modules/Crm/Resources/metadata/clientDefs/KnowledgeBaseArticle.json

@@ -13,9 +13,17 @@
         "select": "crm:views/knowledge-base-article/modals/select-records"
     },
     "filterList": [
-        "published"
+        {
+            "name": "published",
+            "inPortalDisabled": true
+        }
+    ],
+    "boolFilterList": [
+        {
+            "name": "onlyMy",
+            "inPortalDisabled": true
+        }
     ],
-    "boolFilterList": ["onlyMy"],
     "relationshipPanels": {
         "cases": {
             "create": false,
@@ -43,6 +51,9 @@
         },
         "listPortal": {
             "type": "list"
+        },
+        "relationshipsPortal": {
+            "type": "relationships"
         }
     }
 }

application/Espo/Resources/i18n/en_US/Admin.json

@@ -67,6 +67,7 @@
         "detailSmallPortal": "Detail (Small, Portal)",
         "listSmallPortal": "List (Small, Portal)",
         "listPortal": "List (Portal)",
+        "relationshipsPortal": "Relationship Panels (Portal)",
         "filters": "Search Filters",
         "massUpdate": "Mass Update",
         "relationships": "Relationship Panels",

client/modules/crm/src/views/calendar/timeline.js

@@ -454,6 +454,7 @@ Espo.define('crm:views/calendar/timeline', ['view', 'lib!vis'], function (Dep, V
                 });
 
                 timeline.on('click', function (e) {
+                    if (this.blockClick) return;
                     if (e.item) {
                         var $item = this.$el.find('.timeline .vis-item[data-id="'+e.item+'"]');
                         var id = $item.attr('data-record-id');
@@ -468,6 +469,11 @@ Espo.define('crm:views/calendar/timeline', ['view', 'lib!vis'], function (Dep, V
                 }.bind(this));
 
                 timeline.on('rangechanged', function (e) {
+                    e.skipClick = true;
+
+                    this.blockClick = true;
+                    setTimeout(function () {this.blockClick = false}.bind(this), 100);
+
                     this.start = moment(e.start);
                     this.end = moment(e.end);
 

client/src/app.js

@@ -106,6 +106,10 @@ Espo.define(
 
         this.loader.cache = this.cache;
 
+        if (this.useCache && !this.loader.cacheTimestamp && options.cacheTimestamp) {
+            this.loader.cacheTimestamp = options.cacheTimestamp;
+        }
+
         this.setupAjax();
 
         this.settings = new Settings(null);

client/src/loader.js

@@ -212,6 +212,8 @@ var Espo = Espo || {classMap:{}};
             var dataType, type, path, fetchObject;
             var realName = name;
 
+            var noAppCache = false;
+
             if (name.indexOf('lib!') === 0) {
                 dataType = 'script';
                 type = 'lib';
@@ -223,9 +225,11 @@ var Espo = Espo || {classMap:{}};
                 var exportsAs = realName;
 
                 if (realName in this.libsConfig) {
-                    path = this.libsConfig[realName].path || path;
-                    exportsTo = this.libsConfig[realName].exportsTo || exportsTo;
-                    exportsAs = this.libsConfig[realName].exportsAs || exportsAs;
+                    var libData = this.libsConfig[realName] || {};
+                    path = libData.path || path;
+                    exportsTo = libData.exportsTo || exportsTo;
+                    exportsAs = libData.exportsAs || exportsAs;
+                    noAppCache = libData.noAppCache || noAppCache;
                 }
 
                 fetchObject = function (name, d) {
@@ -320,7 +324,7 @@ var Espo = Espo || {classMap:{}};
                 local: true,
                 url: this.basePath + path,
                 success: function (response) {
-                    if (this.cache) {
+                    if (this.cache && !noAppCache) {
                         this.cache.set('a', name, response);
                     }
 

client/src/views/record/detail-bottom.js

@@ -40,6 +40,8 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) {
 
         readOnly: false,
 
+        portalLayoutDisabled: false,
+
         data: function () {
             return {
                 panelList: this.panelList,
@@ -198,6 +200,8 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) {
             this.readOnly = this.options.readOnly || this.readOnly;
             this.inlineEditDisabled = this.options.inlineEditDisabled || this.inlineEditDisabled;
 
+            this.portalLayoutDisabled = this.options.portalLayoutDisabled || this.portalLayoutDisabled;
+
             this.recordViewObject = this.options.recordViewObject;
         },
 
@@ -254,7 +258,13 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) {
         },
 
         loadRelationshipsLayout: function (callback) {
-            this._helper.layoutManager.get(this.model.name, 'relationships', function (layout) {
+            var layoutName = 'relationships';
+            if (this.getUser().isPortal() && !this.portalLayoutDisabled) {
+                if (this.getMetadata().get(['clientDefs', this.scope, 'additionalLayouts', layoutName + 'Portal'])) {
+                    layoutName += 'Portal';
+                }
+            }
+            this._helper.layoutManager.get(this.model.name, layoutName, function (layout) {
                 this.relationshipsLayout = layout;
                 callback.call(this);
             }.bind(this));

client/src/views/record/detail.js

@@ -1185,7 +1185,8 @@ Espo.define('views/record/detail', ['views/record/base', 'view-record-helper'],
                 type: this.type,
                 inlineEditDisabled: this.inlineEditDisabled,
                 recordHelper: this.recordHelper,
-                recordViewObject: this
+                recordViewObject: this,
+                portalLayoutDisabled: this.portalLayoutDisabled
             });
         },
 

client/src/views/record/search.js

@@ -84,7 +84,17 @@ Espo.define('views/record/search', 'view', function (Dep) {
                 return this.fieldList != null && this.moreFieldList != null;
             }.bind(this));
 
-            this.boolFilterList = Espo.Utils.clone(this.getMetadata().get('clientDefs.' + this.scope + '.boolFilterList') || []);
+            this.boolFilterList = Espo.Utils.clone(this.getMetadata().get('clientDefs.' + this.scope + '.boolFilterList') || []).filter(function (item) {
+                if (typeof item === 'string') return true;
+                item = item || {};
+                if (item.inPortalDisabled && this.getUser().isPortal()) return false;
+                if (item.isPortalOnly && !this.getUser().isPortal()) return false;
+                return true;
+            }, this).map(function (item) {
+                if (typeof item === 'string') return item;
+                item = item || {};
+                return item.name;
+            }, this);
 
             var forbiddenFieldList = this.getAcl().getScopeForbiddenFieldList(this.entityType) || [];
 
@@ -97,7 +107,13 @@ Espo.define('views/record/search', 'view', function (Dep) {
                 this.tryReady();
             }.bind(this));
 
-            this.presetFilterList = Espo.Utils.clone(this.getMetadata().get('clientDefs.' + this.scope + '.filterList') || []);
+            this.presetFilterList = (Espo.Utils.clone(this.getMetadata().get('clientDefs.' + this.scope + '.filterList') || [])).filter(function (item) {
+                if (typeof item === 'string') return true;
+                item = item || {};
+                if (item.inPortalDisabled && this.getUser().isPortal()) return false;
+                if (item.isPortalOnly && !this.getUser().isPortal()) return false;
+                return true;
+            }, this);
             ((this.getPreferences().get('presetFilters') || {})[this.scope] || []).forEach(function (item) {
                 this.presetFilterList.push(item);
             }, this);

frontend/less/espo/custom.less

@@ -1241,6 +1241,47 @@ table.table td.cell .complex-text {
     }
 }
 
+.field > .html-container {
+    h1:first-child,
+    h2:first-child,
+    h3:first-child,
+    h4:first-child,
+    h5:first-child,
+    h6:first-child,
+    > p:first-child,
+    > ul:first-child,
+    > ol:first-child,
+    > pre:first-child,
+    > blockquote:first-child {
+        margin-top: 0;
+    }
+
+    > p:last-child,
+    > ul:last-child,
+    > ol:last-child,
+    > pre:last-child,
+    > blockquote:last-child,
+    > table:last-child {
+        margin-bottom: 0;
+    }
+
+    ul > li {
+        list-style-type: disc;
+    }
+
+    ul, ol {
+        padding-left: 30px;
+    }
+
+    p,
+    ul,
+    ol,
+    pre,
+    blockquote {
+        margin-top: @line-height-computed / 2;
+    }
+}
+
 #popup-notifications-container {
     overflow-y: auto;
     overflow-x: hidden;

frontend/less/espo/iframe/iframe.less

@@ -5,6 +5,16 @@ body, table {
     color: @text-color;
 }
 
+body {
+    > p:last-child,
+    > ul:last-child,
+    > ol:last-child,
+    > pre:last-child,
+    > blockquote:last-child {
+        margin-bottom: 0;
+    }
+}
+
 body {
     margin: 0;
 }