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

dev. emails

Browse Source
This commit is contained in:
Yuri Kuznetsov
2014-01-21 17:07:14 +02:00
parent 15b5e21b9e
commit 6b2e2d09c4
16 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Modules/Crm/Controllers/Email.php → application/Espo/Controllers/Email.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace Espo\Modules\Crm\Controllers;
namespace Espo\Controllers;
class Email extends \Espo\Core\Controllers\Record
{
application/Espo/Modules/Crm/Entities/Email.php → application/Espo/Entities/Email.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace Espo\Modules\Crm\Entities;
namespace Espo\Entities;
class Email extends \Espo\Core\ORM\Entity
{
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
+1 -2
View File
@@ -85,8 +85,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
+1 -2
View File
@@ -66,8 +66,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json
+1 -2
View File
@@ -50,8 +50,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
+1 -2
View File
@@ -85,8 +85,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
+1 -2
View File
@@ -96,8 +96,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
+1 -2
View File
@@ -61,8 +61,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
+1 -2
View File
@@ -55,8 +55,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
+1 -2
View File
@@ -84,8 +84,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
+1 -2
View File
@@ -50,8 +50,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Resources/layouts/Email/composeSmall.json
+14
View File
@@ -0,0 +1,14 @@
[
{
"label":"",
"rows":[
[{"name":"from"}],
[{"name":"to"}],
[{"name":"cc"}],
[{"name":"bcc"}],
[{"name":"name"}],
[{"name":"body"}],
[{"name":"attachments","type":"attachmentMultiple"}]
]
}
]
application/Espo/Resources/layouts/Email/detail.json
+3 -2
View File
@@ -2,12 +2,13 @@
{
"label":"",
"rows":[
[{"name":"dateSent"},{"name":"parent"}],
[{"name":"status"},{"name":"parent"}],
[{"name":"dateSent"}, false],
[{"name":"from"},{"name":"cc"}],
[{"name":"to"},{"name":"bcc"}],
[{"name":"name"}],
[{"name":"body"}],
[{"name":"attachments"}]
[{"name":"attachments","type":"attachmentMultiple"}]
]
}
]
application/Espo/Resources/layouts/Email/detailSmall.json
+2 -1
View File
@@ -5,7 +5,8 @@
[{"name":"from"}],
[{"name":"to"}],
[{"name":"name"}],
[{"name":"body"}]
[{"name":"body"}],
[{"name":"attachments","type":"attachmentMultiple"}]
]
}
]
application/Espo/Resources/metadata/entityDefs/Email.json
+4 -3
View File
@@ -36,7 +36,9 @@
"type": "text"
},
"status": {
"type": "varchar"
"type": "enum",
"options": ["Draft", "Sending", "Sent", "Archived"],
"readOnly": true
},
"attachments": {
"type": "linkMultiple"
@@ -66,8 +68,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"
application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
+1 -2
View File
@@ -20,8 +20,7 @@
},
"assignedUser": {
"type": "link",
"required": true,
"default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
"required": true
},
"teams": {
"type": "linkMultiple"