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

stream note message ref

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-07-16 18:13:39 +03:00
parent 68477319e2
commit 39be4cf2be
16 changed files with 78 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/notification/items/assign.js
+1 -3
View File
@@ -42,7 +42,7 @@ define('views/notification/items/assign', ['views/notification/items/base'], fun
this.messageData['entityType'] = Espo.Utils
.upperCaseFirst((this.translate(data.entityType, 'scopeNames') || '').toLowerCase());
this.messageData['entity'] =
this.messageData['html:entity'] =
$('<a>')
.attr('href', '#' + data.entityType + '/view/' + data.entityId)
.text(data.entityName)
@@ -50,7 +50,5 @@ define('views/notification/items/assign', ['views/notification/items/base'], fun
this.createMessage();
},
});
});
client/src/views/notification/items/base.js
+1 -1
View File
@@ -80,7 +80,7 @@ define('views/notification/items/base', ['view'], function (Dep) {
},
getAvatarHtml: function () {
var id = this.userId;
let id = this.userId;
if (this.isSystemAvatar) {
id = 'system';
client/src/views/notification/items/email-received.js
+4 -4
View File
@@ -46,11 +46,11 @@ define('views/notification/items/email-received', ['views/notification/items/bas
this.userId = data.userId;
this.messageData['entityType'] = Espo.Utils
.upperCaseFirst((this.translate(data.entityType, 'scopeNames') || '').toLowerCase());
this.messageData['entityType'] =
Espo.Utils.upperCaseFirst((this.translate(data.entityType, 'scopeNames') || '').toLowerCase());
if (data.personEntityId) {
this.messageData['from'] =
this.messageData['html:from'] =
$('<a>')
.attr('href', '#' + data.personEntityType + '/view/' + data.personEntityId)
.text(data.personEntityName)
@@ -59,7 +59,7 @@ define('views/notification/items/email-received', ['views/notification/items/bas
else {
let text = data.fromString || this.translate('empty address');
this.messageData['from'] =
this.messageData['html:from'] =
$('<span>')
.text(text)
.get(0).outerHTML;
client/src/views/notification/items/entity-removed.js
+4 -4
View File
@@ -39,16 +39,16 @@ define('views/notification/items/entity-removed', ['views/notification/items/bas
this.userId = data.userId;
this.messageData['entityType'] = Espo.Utils
.upperCaseFirst((this.translate(data.entityType, 'scopeNames') || '').toLowerCase())
this.messageData['entityType'] =
Espo.Utils.upperCaseFirst((this.translate(data.entityType, 'scopeNames') || '').toLowerCase())
this.messageData['user'] =
this.messageData['html:user'] =
$('<a>')
.attr('href', '#User/view/' + data.userId)
.text(data.userName)
.get(0).outerHTML;
this.messageData['entity'] =
this.messageData['html:entity'] =
$('<a>')
.attr('href', '#' + data.entityType + '/view/' + data.entityId)
.text(data.entityName)
client/src/views/notification/items/message.js
+7 -8
View File
@@ -26,10 +26,9 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
define(
'views/notification/items/message',
['views/notification/items/base', 'lib!marked', 'lib!dompurify'],
function (Dep, marked, DOMPurify) {
define('views/notification/items/message',
['views/notification/items/base', 'lib!marked', 'lib!dompurify'],
function (Dep, marked, DOMPurify) {
return Dep.extend({
@@ -54,16 +53,16 @@ define(
this.userId = data.userId;
this.messageData['entityType'] = Espo.Utils
.upperCaseFirst((this.translate(data.entityType, 'scopeNames') || '').toLowerCase())
this.messageData['entityType'] =
Espo.Utils.upperCaseFirst((this.translate(data.entityType, 'scopeNames') || '').toLowerCase())
this.messageData['user'] =
this.messageData['html:user'] =
$('<a>')
.attr('href', '#User/view/' + data.userId)
.text(data.userName)
.get(0).outerHTML;
this.messageData['entity'] =
this.messageData['html:entity'] =
$('<a>')
.attr('href', '#' + data.entityType + '/view/' + data.entityId)
.text(data.entityName)
client/src/views/notification/items/system.js
-1
View File
@@ -47,4 +47,3 @@ define('views/notification/items/system', ['views/notification/items/base'], fun
},
});
});
client/src/views/stream/message.js
+28 -10
View File
@@ -30,21 +30,40 @@ define('views/stream/message', ['view'], function (Dep) {
return Dep.extend({
setup: function () {
var template = this.options.messageTemplate;
var data = this.options.messageData;
data: function () {
return this.dataForTemplate;
},
for (var key in data) {
var value = data[key] || '';
setup: function () {
let template = this.options.messageTemplate;
let data = this.options.messageData;
this.dataForTemplate = {};
for (let key in data) {
let value = data[key] || '';
if (key.indexOf('html:') === 0) {
key = key.substring(5);
this.dataForTemplate[key] = value;
template = template.replace('{' + key + '}', '{{{' + key +'}}}');
continue;
}
if (value.indexOf('field:') === 0) {
var field = value.substr(6);
let field = value.substring(6);
this.createField(key, field);
template = template.replace('{' + key +'}', '{{{' + key +'}}}');
} else {
template = template.replace('{' + key +'}', value);
template = template.replace('{' + key + '}', '{{{' + key +'}}}');
continue;
}
this.dataForTemplate[key] = value;
template = template.replace('{' + key + '}', '{{' + key +'}}');
}
this.templateContent = template;
@@ -65,4 +84,3 @@ define('views/stream/message', ['view'], function (Dep) {
},
});
});
client/src/views/stream/note.js
+3 -1
View File
@@ -82,10 +82,12 @@ define('views/stream/note', ['view'], function (Dep) {
this.createField('parent');
}
let translatedEntityType = this.translateEntityType(this.model.get('parentType'));
this.messageData = {
'user': 'field:createdBy',
'entity': 'field:parent',
'entityType': this.getHelper().escapeString(this.translateEntityType(this.model.get('parentType'))),
'entityType': translatedEntityType,
};
if (!this.options.noEdit && (this.isEditable || this.isRemovable)) {
client/src/views/stream/notes/assign.js
+1 -1
View File
@@ -48,7 +48,7 @@ define('views/stream/notes/assign', ['views/stream/note'], function (Dep) {
this.assignedUserId = data.assignedUserId || null;
this.assignedUserName = data.assignedUserName || null;
this.messageData['assignee'] = $('<a>')
this.messageData['html:assignee'] = $('<a>')
.attr('href', '#User/view/' + data.assignedUserId)
.text(data.assignedUserName)
.get(0).outerHTML;
client/src/views/stream/notes/create-related.js
+2 -2
View File
@@ -58,14 +58,14 @@ define('views/stream/notes/create-related', ['views/stream/note'], function (Dep
this.messageData['relatedEntityType'] = this.translateEntityType(this.entityType);
this.messageData['relatedEntity'] =
this.messageData['html:relatedEntity'] =
$('<a>')
.attr('href', '#' + this.entityType + '/view/' + this.entityId)
.text(this.entityName)
.get(0).outerHTML;
this.createMessage();
},
});
});
client/src/views/stream/notes/create.js
+1 -1
View File
@@ -52,7 +52,7 @@ define('views/stream/notes/create', ['views/stream/note'], function (Dep) {
this.assignedUserId = data.assignedUserId || null;
this.assignedUserName = data.assignedUserName || null;
this.messageData['assignee'] = $('<a>')
this.messageData['html:assignee'] = $('<a>')
.attr('href', '#User/view/' + this.assignedUserId)
.text(this.assignedUserName)
.get(0).outerHTML;
client/src/views/stream/notes/email-received.js
+10 -8
View File
@@ -76,10 +76,11 @@ define('views/stream/notes/email-received', ['views/stream/note'], function (Dep
}
}
this.messageData['email'] = $('<a>')
.attr('href', '#Email/view/' + data.emailId)
.text(data.emailName)
.get(0).outerHTML;
this.messageData['html:email'] =
$('<a>')
.attr('href', '#Email/view/' + data.emailId)
.text(data.emailName)
.get(0).outerHTML;
this.messageName = 'emailReceived';
@@ -90,10 +91,11 @@ define('views/stream/notes/email-received', ['views/stream/note'], function (Dep
if (data.personEntityId) {
this.messageName += 'From';
this.messageData['from'] = $('<a>')
.attr('href', '#' + data.personEntityType + '/view/' + data.personEntityId)
.text(data.personEntityName)
.get(0).outerHTML;
this.messageData['html:from'] =
$('<a>')
.attr('href', '#' + data.personEntityType + '/view/' + data.personEntityId)
.text(data.personEntityName)
.get(0).outerHTML;
}
if (
client/src/views/stream/notes/email-sent.js
+10 -8
View File
@@ -68,17 +68,19 @@ define('views/stream/notes/email-sent', ['views/stream/note'], function (Dep) {
}
}
this.messageData['email'] = $('<a>')
.attr('href', '#Email/view/' + data.emailId)
.text(data.emailName)
.get(0).outerHTML;
this.messageData['html:email'] =
$('<a>')
.attr('href', '#Email/view/' + data.emailId)
.text(data.emailName)
.get(0).outerHTML;
this.messageName = 'emailSent';
this.messageData['by'] = $('<a>')
.attr('href', '#' + data.personEntityType + '/view/' + data.personEntityId)
.text(data.personEntityName)
.get(0).outerHTML;
this.messageData['html:by'] =
$('<a>')
.attr('href', '#' + data.personEntityType + '/view/' + data.personEntityId)
.text(data.personEntityName)
.get(0).outerHTML;
if (this.isThis) {
this.messageName += 'This';
client/src/views/stream/notes/mention-in-post.js
+2 -2
View File
@@ -107,7 +107,7 @@ define('views/stream/notes/mention-in-post', ['views/stream/note'], function (De
);
});
this.messageData['target'] = teamHtmlList.join(', ');
this.messageData['html:target'] = teamHtmlList.join(', ');
this.createMessage();
@@ -142,7 +142,7 @@ define('views/stream/notes/mention-in-post', ['views/stream/note'], function (De
);
});
this.messageData['target'] = userHtmlList.join(', ');
this.messageData['html:target'] = userHtmlList.join(', ');
this.createMessage();
client/src/views/stream/notes/post.js
+3 -3
View File
@@ -110,7 +110,7 @@ define('views/stream/notes/post', ['views/stream/note'], function (Dep) {
);
});
this.messageData['target'] = teamHtmlList.join(', ');
this.messageData['html:target'] = teamHtmlList.join(', ');
this.createMessage();
@@ -144,7 +144,7 @@ define('views/stream/notes/post', ['views/stream/note'], function (Dep) {
)
});
this.messageData['target'] = portalHtmlList.join(', ');
this.messageData['html:target'] = portalHtmlList.join(', ');
this.createMessage();
@@ -204,7 +204,7 @@ define('views/stream/notes/post', ['views/stream/note'], function (Dep) {
);
});
this.messageData['target'] = userHtmlList.join(', ');
this.messageData['html:target'] = userHtmlList.join(', ');
this.createMessage();
},
client/src/views/stream/notes/relate.js
+1 -1
View File
@@ -57,7 +57,7 @@ define('views/stream/notes/relate', ['views/stream/note'], function (Dep) {
this.messageData['relatedEntityType'] = this.translateEntityType(this.entityType);
this.messageData['relatedEntity'] =
this.messageData['html:relatedEntity'] =
$('<a>')
.attr('href', '#' + this.entityType + '/view/' + this.entityId)
.text(this.entityName)