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

stream messages improvements

Browse Source
This commit is contained in:
yuri
2016-11-04 12:29:39 +02:00
parent 23fb6c6e1f
commit 9597ea0dbd
5 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Hooks/Common/Stream.php
+2
View File
@@ -240,6 +240,8 @@ class Stream extends \Espo\Core\Hooks\Base
if ($this->getUser()->id === $assignedUserId) {
$entity->set('isFollowed', true);
}
} else {
$this->getStreamService()->noteAssign($entity);
}
}
$this->getStreamService()->handleAudited($entity);
application/Espo/Resources/i18n/en_US/Global.json
+8 -1
View File
@@ -323,17 +323,24 @@
"createThis": "{user} created this {entityType}",
"createAssignedThis": "{user} created this {entity} assigned to {assignee}",
"createAssignedThis": "{user} created this {entityType} assigned to {assignee}",
"createAssigned": "{user} created {entityType} {entity} assigned to {assignee}",
"createAssignedYou": "{user} created {entityType} {entity} assigned to you",
"createAssignedThisSelf": "{user} created this {entityType} self-assigned",
"createAssignedSelf": "{user} created {entityType} {entity} self-assigned",
"assign": "{user} assigned {entityType} {entity} to {assignee}",
"assignThis": "{user} assigned this {entityType} to {assignee}",
"assignYou": "{user} assigned {entityType} {entity} to you",
"assignThisVoid": "{user} unassigned this {entityType}",
"assignVoid": "{user} unassigned {entityType} {entity}",
"assignThisSelf": "{user} self-assigned this {entityType}",
"assignSelf": "{user} self-assigned {entityType} {entity}",
application/Espo/Services/Stream.php
+13 -7
View File
@@ -807,7 +807,7 @@ class Stream extends \Espo\Core\Services\Base
$data = array();
if ($entity->get('assignedUserId') != $entity->get('createdById')) {
if ($entity->get('assignedUserId')) {
if (!$entity->has('assignedUserName')) {
$this->loadAssignedUserName($entity);
}
@@ -872,13 +872,19 @@ class Stream extends \Espo\Core\Services\Base
$note->set('superParentType', 'Account');
}
if (!$entity->has('assignedUserName')) {
$this->loadAssignedUserName($entity);
if ($entity->get('assignedUserId')) {
if (!$entity->has('assignedUserName')) {
$this->loadAssignedUserName($entity);
}
$note->set('data', array(
'assignedUserId' => $entity->get('assignedUserId'),
'assignedUserName' => $entity->get('assignedUserName'),
));
} else {
$note->set('data', array(
'assignedUserId' => null
));
}
$note->set('data', array(
'assignedUserId' => $entity->get('assignedUserId'),
'assignedUserName' => $entity->get('assignedUserName'),
));
$this->getEntityManager()->saveEntity($note);
}
client/src/views/stream/notes/assign.js
+15 -7
View File
@@ -55,16 +55,24 @@ Espo.define('views/stream/notes/assign', 'views/stream/note', function (Dep) {
this.messageData['assignee'] = '<a href="#User/view/' + data.assignedUserId + '">' + data.assignedUserName + '</a>';
if (this.isUserStream) {
if (this.assignedUserId == this.model.get('createdById')) {
this.messageName += 'Self';
} else {
if (this.assignedUserId == this.getUser().id) {
this.messageName += 'You';
if (this.assignedUserId) {
if (this.assignedUserId == this.model.get('createdById')) {
this.messageName += 'Self';
} else {
if (this.assignedUserId == this.getUser().id) {
this.messageName += 'You';
}
}
} else {
this.messageName += 'Void';
}
} else {
if (this.assignedUserId == this.model.get('createdById')) {
this.messageName += 'Self';
if (this.assignedUserId) {
if (this.assignedUserId == this.model.get('createdById')) {
this.messageName += 'Self';
}
} else {
this.messageName += 'Void';
}
}
client/src/views/stream/notes/create.js
+11 -2
View File
@@ -63,11 +63,20 @@ Espo.define('views/stream/notes/create', 'views/stream/note', function (Dep) {
if (this.assignedUserId) {
this.messageName = 'createAssigned';
if (this.isThis) {
this.messageName += 'This';
if (this.assignedUserId == this.model.get('createdById')) {
this.messageName += 'Self';
}
} else {
if (isYou) {
this.messageName += 'You';
if (this.assignedUserId == this.model.get('createdById')) {
this.messageName += 'Self';
} else {
if (isYou) {
this.messageName += 'You';
}
}
}
}