update bullbone and cs fixes

This commit is contained in:
Yuri Kuznetsov
2022-06-10 11:52:24 +03:00
parent 2422940477
commit 0578268f2d
9 changed files with 20 additions and 22 deletions
-2
View File
@@ -148,8 +148,6 @@ define('collection', [], function () {
this.defaultOrderBy = this.orderBy;
this.data = {};
Backbone.Collection.prototype.initialize.call(this);
},
_onModelEvent: function(event, model, collection, options) {
+2 -1
View File
@@ -32,6 +32,7 @@ define('collections/tree', 'collection', function (Dep) {
createSeed: function () {
var seed = new this.constructor();
seed.url = this.url;
seed.model = this.model;
seed._user = this._user;
@@ -89,11 +90,11 @@ define('collections/tree', 'collection', function (Dep) {
if (this.parentId) {
options.data.parentId = this.parentId;
}
options.data.maxDepth = this.maxDepth;
return Dep.prototype.fetch.call(this, options);
},
});
});
+2 -2
View File
@@ -40,10 +40,10 @@ define('model-offline', 'model', function (Model) {
_key: null,
initialize: function (attributes, options) {
options = options || {};
Model.prototype.initialize.apply(this, arguments);
options = options || {};
this._key = this.url = this.name;
this.cache = options.cache || null;
-2
View File
@@ -98,8 +98,6 @@ define('model', [], function () {
this.defs.fields = this.defs.fields || {};
this.defs.links = this.defs.links || {};
Dep.prototype.initialize.call(this);
},
/**
+2 -2
View File
@@ -25,10 +25,10 @@
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('models/email', 'model', function (Dep) {
define('models/email', 'model', function (Dep) {
return Dep.extend({
});
});
+5 -5
View File
@@ -25,23 +25,23 @@
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('models/preferences', 'model', function (Dep) {
define('models/preferences', 'model', function (Dep) {
return Dep.extend({
name: "Preferences",
name: 'Preferences',
settings: null,
getDashletOptions: function (id) {
var value = this.get('dashletsOptions') || {};
return value[id] || false;
},
isPortal: function () {
return this.get('isPortalUser');
}
},
});
});
+3 -2
View File
@@ -25,7 +25,8 @@
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('models/user', 'model', function (Dep) {
define('models/user', 'model', function (Dep) {
return Dep.extend({
@@ -53,6 +54,6 @@ Espo.define('models/user', 'model', function (Dep) {
isSuperAdmin: function () {
return this.get('type') == 'super-admin';
}
},
});
});
+5 -5
View File
@@ -15,7 +15,7 @@
"bootstrap": "^3.4.1",
"bootstrap-colorpicker": "^2.5.2",
"bootstrap-datepicker": "^1.9.0",
"bullbone": "github:yurikuzn/bull#1.0.7",
"bullbone": "github:yurikuzn/bull#1.0.8",
"cronstrue": "^1.114.0",
"cropper": "^0.7.9",
"devbridge-autocomplete": "^1.4.11",
@@ -843,8 +843,8 @@
}
},
"node_modules/bullbone": {
"version": "1.0.7",
"resolved": "git+ssh://git@github.com/yurikuzn/bull.git#f659d48643798a5128bd3be7216fb68d88b1b745",
"version": "1.0.8",
"resolved": "git+ssh://git@github.com/yurikuzn/bull.git#33c6f5eda17b2a47abb26702be195c38b0c33e23",
"license": "MIT"
},
"node_modules/caniuse-lite": {
@@ -4419,8 +4419,8 @@
"dev": true
},
"bullbone": {
"version": "git+ssh://git@github.com/yurikuzn/bull.git#f659d48643798a5128bd3be7216fb68d88b1b745",
"from": "bullbone@github:yurikuzn/bull#1.0.7"
"version": "git+ssh://git@github.com/yurikuzn/bull.git#33c6f5eda17b2a47abb26702be195c38b0c33e23",
"from": "bullbone@github:yurikuzn/bull#1.0.8"
},
"caniuse-lite": {
"version": "1.0.30001309",
+1 -1
View File
@@ -37,7 +37,7 @@
"bootstrap": "^3.4.1",
"bootstrap-colorpicker": "^2.5.2",
"bootstrap-datepicker": "^1.9.0",
"bullbone": "github:yurikuzn/bull#1.0.7",
"bullbone": "github:yurikuzn/bull#1.0.8",
"cronstrue": "^1.114.0",
"cropper": "^0.7.9",
"devbridge-autocomplete": "^1.4.11",