manual merge

This commit is contained in:
Yuri Kuznetsov
2020-04-13 15:35:48 +03:00

View File

@@ -64,7 +64,7 @@ define('views/email/fields/subject', 'views/fields/varchar', function (Dep) {
},
getAttributeList: function () {
return ['name', 'isRead', 'isImportant', 'hasAttachment', 'inTrash'];
return ['name', 'subject', 'isRead', 'isImportant', 'hasAttachment', 'inTrash'];
},
setup: function () {
@@ -82,5 +82,12 @@ define('views/email/fields/subject', 'views/fields/varchar', function (Dep) {
Dep.prototype.afterRender.call(this);
},
fetch: function () {
var data = Dep.prototype.fetch.call(this);
data.name = data.subject;
return data;
},
});
});