7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into admin-login

Browse Source
This commit is contained in:
André Peters
2019-03-18 02:03:59 +01:00
committed by GitHub
parent ae19d81f2d d8e356f590
commit 3d8a46357b
16 changed files with 123 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
data/web/js/site/mailbox.js
View File

@@ -734,8 +734,18 @@ jQuery(function($){
'</div>';
item.chkbox = '<input type="checkbox" data-id="alias" name="multi_select" value="' + encodeURIComponent(item.id) + '" />';
item.goto = escapeHtml(item.goto.replace(/,/g, " "));
item.public_comment = escapeHtml(item.public_comment);
item.private_comment = escapeHtml(item.private_comment);
if (item.public_comment !== null) {
item.public_comment = escapeHtml(item.public_comment);
}
else {
item.public_comment = '-';
}
if (item.private_comment !== null) {
item.private_comment = escapeHtml(item.private_comment);
}
else {
item.private_comment = '-';
}
if (item.is_catch_all == 1) {
item.address = '<div class="label label-default">Catch-All</div> ' + escapeHtml(item.address);
}
@@ -990,4 +1000,4 @@ jQuery(function($){
draw_tls_policy_table();
draw_transport_maps_table();
});
});