espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.0.5'

Browse Source
This commit is contained in:
yuri
2016-04-04 16:37:11 +03:00
parent 182fc8b65e 18f13acfa9
commit ae1db7990e
24 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Templates/Metadata/Base/entityDefs.json
+2 -1
View File
@@ -32,7 +32,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
}
},
"links": {
application/Espo/Core/Templates/Metadata/Person/entityDefs.json
+2 -1
View File
@@ -73,7 +73,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
}
},
"links": {
application/Espo/Core/Utils/EntityManager.php
+14 -2
View File
@@ -320,9 +320,15 @@ class EntityManager
switch ($linkType) {
case 'oneToMany':
if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.field.' . $linkForeign)) {
if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign)) {
throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'] already exists.');
}
if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign . 'Id')) {
throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'Id] already exists.');
}
if ($this->getMetadata()->get('entityDefs.' . $entityForeign . '.fields.' . $linkForeign . 'Name')) {
throw new Conflict('Field ['.$entityForeign.'::'.$linkForeign.'Name] already exists.');
}
$dataLeft = array(
'fields' => array(
$link => array(
@@ -361,9 +367,15 @@ class EntityManager
);
break;
case 'manyToOne':
if ($this->getMetadata()->get('entityDefs.' . $entity . '.field.' . $link)) {
if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link)) {
throw new Conflict('Field ['.$entity.'::'.$link.'] already exists.');
}
if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link . 'Id')) {
throw new Conflict('Field ['.$entity.'::'.$link.'Id] already exists.');
}
if ($this->getMetadata()->get('entityDefs.' . $entity . '.fields.' . $link . 'Name')) {
throw new Conflict('Field ['.$entity.'::'.$link.'Name] already exists.');
}
$dataLeft = array(
'fields' => array(
$link => array(
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
+2 -1
View File
@@ -140,7 +140,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"targetLists": {
"type": "linkMultiple",
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
+2 -1
View File
@@ -112,7 +112,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
}
},
"links": {
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json
+2 -1
View File
@@ -47,7 +47,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"targetLists": {
"type": "linkMultiple",
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json
+2 -1
View File
@@ -76,7 +76,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
}
},
"links": {
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
+2 -1
View File
@@ -156,7 +156,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"targetLists": {
"type": "linkMultiple",
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Document.json
+2 -1
View File
@@ -64,7 +64,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"accounts": {
"type": "linkMultiple",
application/Espo/Modules/Crm/Resources/metadata/entityDefs/DocumentFolder.json
+2 -1
View File
@@ -25,7 +25,8 @@
"readOnly": true
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"parent": {
"type": "link"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/KnowledgeBaseArticle.json
+2 -1
View File
@@ -55,7 +55,8 @@
"views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"categories": {
"type": "linkMultiple",
application/Espo/Modules/Crm/Resources/metadata/entityDefs/KnowledgeBaseCategory.json
+2 -1
View File
@@ -29,7 +29,8 @@
"required": true
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"parent": {
"type": "link"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
+2 -1
View File
@@ -115,7 +115,8 @@
"disabled": true
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"campaign": {
"type": "link",
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
+2 -1
View File
@@ -107,7 +107,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
}
},
"links": {
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
+2 -1
View File
@@ -94,7 +94,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
}
},
"links": {
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Target.json
+2 -1
View File
@@ -86,7 +86,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
}
},
"links": {
application/Espo/Modules/Crm/Resources/metadata/entityDefs/TargetList.json
+2 -1
View File
@@ -36,7 +36,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"campaigns": {
"type": "link"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
+2 -1
View File
@@ -85,7 +85,8 @@
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"attachments": {
"type": "attachmentMultiple",
application/Espo/Repositories/EmailAddress.php
+1
View File
@@ -320,6 +320,7 @@ class EmailAddress extends \Espo\Core\ORM\Repositories\RDB
".$pdo->quote($emailAddress->id).",
".$pdo->quote((int)($address === $primary))."
)
ON DUPLICATE KEY UPDATE deleted = 0, `primary` = ".$pdo->quote((int)($address === $primary))."
";
$sth = $pdo->prepare($query);
$sth->execute();
application/Espo/Repositories/PhoneNumber.php
+1
View File
@@ -233,6 +233,7 @@ class PhoneNumber extends \Espo\Core\ORM\Repositories\RDB
".$pdo->quote($phoneNumber->id).",
".$pdo->quote((int)($number === $primary))."
)
ON DUPLICATE KEY UPDATE deleted = 0, `primary` = ".$pdo->quote((int)($number === $primary))."
";
$sth = $pdo->prepare($query);
$sth->execute();
application/Espo/Resources/i18n/en_US/EntityManager.json
+1 -1
View File
@@ -44,6 +44,6 @@
"messages": {
"entityCreated": "Entity has been created",
"linkAlreadyExists": "Link name conflict.",
"linkConflict": "Link with the same name already exists."
"linkConflict": "Name conflict: link or field with the same name already exists."
}
}
application/Espo/Resources/metadata/entityDefs/Email.json
+2 -1
View File
@@ -206,7 +206,8 @@
"notStorable": true
},
"teams": {
"type": "linkMultiple"
"type": "linkMultiple",
"view": "views/fields/teams"
},
"users": {
"type": "linkMultiple",
client/src/views/admin/link-manager/modals/edit.js
+2 -2
View File
@@ -338,7 +338,7 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
if (view) {
view.disabled = true;
}
this.$el.find('.cell-' + name).css('visibility', 'hidden');
this.$el.find('.cell[data-name=' + name+']').css('visibility', 'hidden');
},
showField: function (name) {
@@ -346,7 +346,7 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
if (view) {
view.disabled = false;
}
this.$el.find('.cell-' + name).css('visibility', 'visible');
this.$el.find('.cell[data-name=' + name+']').css('visibility', 'visible');
},
handleLinkTypeChange: function () {
client/src/views/fields/user-with-avatar.js
+1 -1
View File
@@ -36,7 +36,7 @@ Espo.define('views/fields/user-with-avatar', 'views/fields/user', function (Dep)
data: function () {
var o = _.extend({}, Dep.prototype.data.call(this));
if (this.mode == 'detail' || this.mode == 'list') {
if (this.mode == 'detail') {
o.avatar = this.getAvatarHtml();
}
return o;