git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "32243e56"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "e2b4b6f6"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
diff --git a/mailcow/src/mailcow-dockerized/data/web/js/site/mailbox.js b/mailcow/src/mailcow-dockerized/data/web/js/site/mailbox.js
index 5cac48d..745c4f2 100644
--- a/mailcow/src/mailcow-dockerized/data/web/js/site/mailbox.js
+++ b/mailcow/src/mailcow-dockerized/data/web/js/site/mailbox.js
@@ -98,6 +98,38 @@
auto_fill_quota($('#addSelectDomain').val());
});
auto_fill_quota($('#addSelectDomain').val());
+
+ // Read bcc local dests
+ // Using ajax to not be a blocking moo
+ $.get("/api/v1/get/bcc-destination-options", function(data){
+ // Domains
+ var optgroup = "<optgroup label='" + lang.domains + "'>";
+ $.each(data.domains, function(index, domain){
+ optgroup += "<option value='" + domain + "'>" + domain + "</option>"
+ });
+ optgroup += "</optgroup>"
+ $('#bcc-local-dest').append(optgroup);
+ // Alias domains
+ var optgroup = "<optgroup label='" + lang.domain_aliases + "'>";
+ $.each(data.alias_domains, function(index, alias_domain){
+ optgroup += "<option value='" + alias_domain + "'>" + alias_domain + "</option>"
+ });
+ optgroup += "</optgroup>"
+ $('#bcc-local-dest').append(optgroup);
+ // Mailboxes and aliases
+ $.each(data.mailboxes, function(mailbox, aliases){
+ var optgroup = "<optgroup label='" + mailbox + "'>";
+ $.each(aliases, function(index, alias){
+ optgroup += "<option value='" + alias + "'>" + alias + "</option>"
+ });
+ optgroup += "</optgroup>"
+ $('#bcc-local-dest').append(optgroup);
+ });
+ // Finish
+ $('#bcc-local-dest').find('option:selected').remove();
+ $('#bcc-local-dest').selectpicker('refresh');
+ });
+
$(".goto_checkbox").click(function( event ) {
$("form[data-id='add_alias'] .goto_checkbox").not(this).prop('checked', false);
if ($("form[data-id='add_alias'] .goto_checkbox:checked").length > 0) {
@@ -956,6 +988,7 @@
{"name":"exclude","title":lang.excludes,"breakpoints":"all"},
{"name":"mins_interval","title":lang.mins_interval,"breakpoints":"all"},
{"name":"last_run","title":lang.last_run,"breakpoints":"xs sm md"},
+ {"name":"exit_status","filterable": false,"title":lang.syncjob_last_run_result},
{"name":"log","title":"Log"},
{"name":"active","filterable": false,"style":{"min-width":"70px","width":"70px"},"title":lang.active,"formatter": function(value){return 1==value?'<i class="bi bi-check-lg"></i>':0==value&&'<i class="bi bi-x-lg"></i>';}},
{"name":"is_running","filterable": false,"style":{"min-width":"120px","width":"100px"},"title":lang.status},
@@ -992,6 +1025,18 @@
if (!item.last_run > 0) {
item.last_run = lang.waiting;
}
+ if (item.success == null) {
+ item.success = '-';
+ item.exit_status = '';
+ } else {
+ item.success = '<i class="text-' + (item.success == 1 ? 'success' : 'danger') + ' bi bi-' + (item.success == 1 ? 'check-lg' : 'x-lg') + '"></i>';
+ }
+ if (lang['syncjob_'+item.exit_status]) {
+ item.exit_status = lang['syncjob_'+item.exit_status];
+ } else if (item.success != '-') {
+ item.exit_status = lang.syncjob_check_log;
+ }
+ item.exit_status = item.success + ' ' + item.exit_status;
});
}
}),