fix kanban sort 2

client/src/collection.js

@@ -57,7 +57,9 @@ Espo.define('collection', [], function () {
             this.url = this.url || this.urlRoot;
 
             this.sortBy = options.sortBy || this.sortBy;
+            this.defaultSortBy = this.sortBy;
             this.asc = ('asc' in options) ? options.asc : this.asc;
+            this.defaultAsc = this.asc;
             this.data = {};
 
             Backbone.Collection.prototype.initialize.call(this);

client/src/views/admin/field-manager/edit.js

@@ -285,7 +285,7 @@ Espo.define('views/admin/field-manager/edit', ['view', 'model'], function (Dep,
                 }
                 this.model.set('label', label);
                 if (name) {
-                    name = name.replace(/-/i, '').replace(/_/i, '').replace(/[^\w\s]/gi, '').replace(/ (.)/g, function(match, g) {
+                    name = name.replace(/-/g, '').replace(/_/g, '').replace(/[^\w\s]/gi, '').replace(/ (.)/g, function(match, g) {
                         return g.toUpperCase();
                     }).replace(' ', '');
                     if (name.length) {

client/src/views/fields/wysiwyg.js

@@ -211,19 +211,27 @@ Espo.define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], fun
                         var $document = $(documentElement);
 
                         var increaseHeightStep = 10;
-                        var processIncreaseHeight = function (iteration) {
+                        var processIncreaseHeight = function (iteration, previousDiff) {
                             iteration = iteration || 0;
 
-                            if (iteration > 20) {
+                            if (iteration > 200) {
                                 return;
                             }
 
                             iteration ++;
 
-                            if (iframeElement.scrollHeight < $document.height()) {
+                            var diff = $document.height() - iframeElement.scrollHeight;
+
+                            if (typeof previousDiff !== 'undefined') {
+                                if (diff === previousDiff) {
+                                    return;
+                                }
+                            }
+
+                            if (diff) {
                                 var height = iframeElement.scrollHeight + increaseHeightStep;
                                 iframeElement.style.height = height + 'px';
-                                processIncreaseHeight(iteration);
+                                processIncreaseHeight(iteration, diff);
                             }
                         };
 

client/src/views/list.js

@@ -233,8 +233,8 @@ Espo.define('views/list', ['views/main', 'search-manager'], function (Dep, Searc
             this.collection.url = this.scope + '/action/listKanban';
             this.collection.maxSize = this.getConfig().get('recordsPerPageSmall');
 
-            this.collection.sortBy = this.defaultSortBy;
-            this.collection.asc = this.defaultAsc;
+            this.collection.sortBy = this.collection.defaultSortBy;
+            this.collection.asc = this.collection.defaultAsc;
         },
 
         resetSorting: function () {

client/src/views/record/kanban.js

@@ -191,8 +191,8 @@ Espo.define('views/record/kanban', ['views/record/list'], function (Dep) {
             this.seedCollection.url = this.scope;
             this.seedCollection.maxSize = this.collection.maxSize;
             this.seedCollection.name = this.collection.name;
-            this.seedCollection.sortBy = this.collection.sortBy;
-            this.seedCollection.asc = this.collection.asc;
+            this.seedCollection.sortBy = this.collection.defaultSortBy;
+            this.seedCollection.asc = this.collection.defaultAsc;
 
             this.listenTo(this.collection, 'sync', function (c, r, options) {
                 if (this.hasView('modal') && this.getView('modal').isRendered()) return;
@@ -343,7 +343,7 @@ Espo.define('views/record/kanban', ['views/record/list'], function (Dep) {
                     var collection = this.seedCollection.clone();
                     collection.total = item.total;
                     collection.url = this.scope;
-                    collection.where = this.seedCollection.where;
+                    collection.where = this.collection.where;
                     collection.name = this.seedCollection.name;
                     collection.maxSize = this.seedCollection.maxSize;
                     collection.sortBy = this.seedCollection.sortBy;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "description": "",
   "main": "index.php",
   "repository": {