Merge branch 'stable'
This commit is contained in:
@@ -56,6 +56,8 @@ define('views/fields/link-parent', 'views/fields/base', function (Dep) {
|
||||
|
||||
searchTypeList: ['is', 'isEmpty', 'isNotEmpty'],
|
||||
|
||||
initialSearchIsNotIdle: true,
|
||||
|
||||
data: function () {
|
||||
var nameValue = this.model.get(this.nameName);
|
||||
if (!nameValue && this.model.get(this.idName) && this.model.get(this.typeName)) {
|
||||
|
||||
@@ -438,6 +438,8 @@ define('views/fields/link', 'views/fields/base', function (Dep) {
|
||||
this.searchData.oneOfIdList.splice(index, 1);
|
||||
}
|
||||
delete this.searchData.oneOfNameHash[id];
|
||||
|
||||
this.trigger('change');
|
||||
},
|
||||
|
||||
addLinkOneOf: function (id, name) {
|
||||
@@ -445,6 +447,8 @@ define('views/fields/link', 'views/fields/base', function (Dep) {
|
||||
this.searchData.oneOfIdList.push(id);
|
||||
this.searchData.oneOfNameHash[id] = name;
|
||||
this.addLinkOneOfHtml(id, name);
|
||||
|
||||
this.trigger('change');
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -150,6 +150,8 @@ Espo.define('views/fields/user', 'views/fields/link', function (Dep) {
|
||||
this.searchData.teamIdList.splice(index, 1);
|
||||
}
|
||||
delete this.searchData.teamNameHash[id];
|
||||
|
||||
this.trigger('change');
|
||||
},
|
||||
|
||||
addLinkTeams: function (id, name) {
|
||||
@@ -159,6 +161,8 @@ Espo.define('views/fields/user', 'views/fields/link', function (Dep) {
|
||||
this.searchData.teamIdList.push(id);
|
||||
this.searchData.teamNameHash[id] = name;
|
||||
this.addLinkTeamsHtml(id, name);
|
||||
|
||||
this.trigger('change');
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
Generated
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "espocrm",
|
||||
"version": "6.1.6",
|
||||
"version": "6.1.7",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "espocrm",
|
||||
"version": "6.1.6",
|
||||
"version": "6.1.7",
|
||||
"description": "",
|
||||
"main": "index.php",
|
||||
"repository": {
|
||||
|
||||
Reference in New Issue
Block a user