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-01 11:16:34 +03:00
parent c9db2687f5 49b581dafd
commit 182fc8b65e
15 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Templates/Metadata/Base/entityDefs.json
+1 -1
View File
@@ -29,7 +29,7 @@
"assignedUser": {
"type": "link",
"required": true,
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Core/Templates/Metadata/Person/entityDefs.json
+1 -1
View File
@@ -70,7 +70,7 @@
"assignedUser": {
"type": "link",
"required": false,
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
+1 -1
View File
@@ -109,7 +109,7 @@
"assignedUser": {
"type": "link",
"required": true,
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json
+1 -1
View File
@@ -44,7 +44,7 @@
},
"assignedUser": {
"type": "link",
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json
+1 -1
View File
@@ -73,7 +73,7 @@
},
"assignedUser": {
"type": "link",
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Document.json
+1 -1
View File
@@ -61,7 +61,7 @@
},
"assignedUser": {
"type": "link",
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/KnowledgeBaseArticle.json
+2 -1
View File
@@ -51,7 +51,8 @@
"readOnly": true
},
"assignedUser": {
"type": "link"
"type": "link",
"views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
+1 -1
View File
@@ -107,7 +107,7 @@
},
"assignedUser": {
"type": "link",
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"acceptanceStatus": {
"type": "varchar",
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
+1 -1
View File
@@ -104,7 +104,7 @@
"assignedUser": {
"type": "link",
"required": true,
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
+1 -1
View File
@@ -91,7 +91,7 @@
"assignedUser": {
"type": "link",
"required": false,
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Target.json
+1 -1
View File
@@ -83,7 +83,7 @@
},
"assignedUser": {
"type": "link",
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/TargetList.json
+1 -1
View File
@@ -33,7 +33,7 @@
},
"assignedUser": {
"type": "link",
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
+1 -1
View File
@@ -82,7 +82,7 @@
"assignedUser": {
"type": "link",
"required": true,
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple"
application/Espo/Resources/metadata/entityDefs/Email.json
+1 -1
View File
@@ -183,7 +183,7 @@
"assignedUser": {
"type": "link",
"required": false,
"view": "views/fields/user"
"view": "views/fields/assigned-user"
},
"replied": {
"type": "link",
application/Espo/Services/Record.php
+6 -3
View File
@@ -361,13 +361,16 @@ class Record extends \Espo\Core\Services\Base
$assignedUserId = $entity->get('assignedUserId');
$assignmentPermission = $this->getAcl()->get('assignmentPermission');
if (empty($assignedUserId)) {
if ($assignmentPermission === 'no') {
return false;
}
return true;
}
$assignmentPermission = $this->getAcl()->get('assignmentPermission');
if (empty($assignmentPermission) || $assignmentPermission === true || !in_array($assignmentPermission, ['team', 'no'])) {
if ($assignmentPermission === true || !in_array($assignmentPermission, ['team', 'no'])) {
return true;
}