From fdeac68216c5cb28c30cd547686dfd96ad2958eb Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 30 May 2018 16:14:15 +0300 Subject: [PATCH] fix kanban sorting --- client/src/collection.js | 2 ++ client/src/views/record/kanban.js | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/src/collection.js b/client/src/collection.js index f362f2eafb..2d214a707e 100644 --- a/client/src/collection.js +++ b/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); diff --git a/client/src/views/record/kanban.js b/client/src/views/record/kanban.js index be1978e570..3c702775e2 100644 --- a/client/src/views/record/kanban.js +++ b/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; @@ -346,8 +346,8 @@ Espo.define('views/record/kanban', ['views/record/list'], function (Dep) { collection.where = this.collection.where; collection.name = this.seedCollection.name; collection.maxSize = this.seedCollection.maxSize; - collection.sortBy = this.collection.sortBy; - collection.asc = this.collection.asc; + collection.sortBy = this.seedCollection.sortBy; + collection.asc = this.seedCollection.asc; collection.whereAdditional = [ { field: this.statusField,