amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-06 19:09:43 +00:00
Code Issues Projects Releases Wiki Activity

feat(mail): Add an option in Preferences to display full email instead of name alone in mailboxes

Browse Source
This commit is contained in:
Hivert Quentin
2023-11-23 14:09:57 +01:00
parent 8babb23c58
commit 2e670f7e62
10 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/Message.service.js
+11 -2
View File
@@ -273,7 +273,7 @@
* @desc Format the first address of a specific type with a short description.
* @returns a string of the name or the email of the envelope address type
*/
Message.prototype.$shortAddress = function (type) {
Message.prototype.$shortAddress = function (type, fullEmail) {
var address = '';
if (this[type]) {
if (angular.isString(this[type])) {
@@ -289,7 +289,16 @@
}
else if (this[type].length > 0) {
// We have an array of objects; pick the first one
address = this[type][0].name || this[type][0].email || '';
if(!fullEmail)
address = this[type][0].name || this[type][0].email || '';
else if(this[type][0].name && this[type][0].email)
address = this[type][0].name + ' <' + this[type][0].email +'>';
else if(this[type][0].name)
address = this[type][0].name;
else if(this[type][0].email)
address = this[type][0].email;
else
address = '';
}
}
UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
+4 -5
View File
@@ -58,8 +58,8 @@
/**
* @ngInject
*/
sgMessageListItemMainController.$inject = ['$scope', '$element', '$parse', '$state', '$mdUtil', '$mdToast', 'Mailbox', 'Message', 'encodeUriFilter'];
function sgMessageListItemMainController($scope, $element, $parse, $state, $mdUtil, $mdToast, Mailbox, Message, encodeUriFilter) {
sgMessageListItemMainController.$inject = ['$scope', '$element', '$parse', '$state', '$mdUtil', '$mdToast', 'Mailbox', 'Message', 'encodeUriFilter', 'Preferences'];
function sgMessageListItemMainController($scope, $element, $parse, $state, $mdUtil, $mdToast, Mailbox, Message, encodeUriFilter, Preferences) {
var $ctrl = this;
this.$postLink = function () {
@@ -83,7 +83,6 @@
threadButton = angular.element(threadButton);
this.threadIconElement = threadButton.find('md-icon')[0];
this.threadCountElement = threadButton.find('span')[0];
this.priorityIconElement = contentDivElement.find('md-icon')[0];
if (Mailbox.$virtualMode) {
@@ -144,9 +143,9 @@
// Sender or recipient when in Sent or Draft mailbox
if ($ctrl.MailboxService.selectedFolder.isSentFolder || $ctrl.MailboxService.selectedFolder.isDraftsFolder)
$ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('to').encodeEntities();
$ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('to', Preferences.defaults.SOGoMailDisplayFullEmail).encodeEntities();
else
$ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('from').encodeEntities();
$ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('from', Preferences.defaults.SOGoMailDisplayFullEmail).encodeEntities();
// Priority icon
if ($ctrl.message.priority && $ctrl.message.priority.level < 3) {