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

[Web] Do not use hard-coded params in imapsync jobs

Browse Source 
[Web] Allow custom parameters in imapsync
This commit is contained in:
André
2018-07-27 22:19:59 +02:00
parent 1115b826f9
commit 6f656c39b4
10 changed files with 143 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/web/js/api.js
View File

@@ -80,11 +80,11 @@ $(document).ready(function() {
// If clicked element #edit_selected is in a form with the same data-id as the button,
// we merge all input fields by {"name":"value"} into api-attr
if ($(this).closest("form").data('id') == id) {
var req_empty = false;
var invalid = false;
$(this).closest("form").find('select, textarea, input').each(function() {
if ($(this).prop('required')) {
if (!$(this).val() && $(this).prop('disabled') === false) {
req_empty = true;
invalid = true;
$(this).addClass('inputMissingAttr');
} else {
$(this).removeClass('inputMissingAttr');
@@ -106,7 +106,7 @@ $(document).ready(function() {
}
}
});
if (!req_empty) {
if (!invalid) {
var attr_to_merge = $(this).closest("form").serializeObject();
var api_attr = $.extend(api_attr, attr_to_merge)
} else {

24
data/web/js/mailbox.js
View File

@@ -233,7 +233,7 @@ jQuery(function($){
ft_paging.goto(parseInt(current_page[name]))
}
}
function table_mailbox_paging(ft, name) {
function paging_mailbox_after(ft, name) {
var ft_paging = ft.use(FooTable.Paging)
current_page[name] = ft_paging.current;
localStorage.setItem('current_page', JSON.stringify(current_page));
@@ -306,7 +306,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'domain_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'domain_table');
paging_mailbox_after(ft, 'domain_table');
}
}
});
@@ -392,7 +392,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'mailbox_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'mailbox_table');
paging_mailbox_after(ft, 'mailbox_table');
}
}
});
@@ -457,7 +457,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'resource_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'resource_table');
paging_mailbox_after(ft, 'resource_table');
}
}
});
@@ -519,7 +519,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'bcc_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'bcc_table');
paging_mailbox_after(ft, 'bcc_table');
}
}
});
@@ -576,7 +576,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'recipient_map_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'recipient_map_table');
paging_mailbox_after(ft, 'recipient_map_table');
}
}
});
@@ -645,7 +645,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'alias_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'alias_table');
paging_mailbox_after(ft, 'alias_table');
}
}
});
@@ -699,7 +699,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'aliasdomain_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'aliasdomain_table');
paging_mailbox_after(ft, 'aliasdomain_table');
}
}
});
@@ -711,10 +711,10 @@ jQuery(function($){
{"name":"chkbox","title":"","style":{"maxWidth":"60px","width":"60px","text-align":"center"},"filterable": false,"sortable": false,"type":"html"},
{"sorted": true,"name":"id","title":"ID","style":{"maxWidth":"60px","width":"60px","text-align":"center"}},
{"name":"user2","title":lang.owner},
{"name":"server_w_port","title":"Server","breakpoints":"xs"},
{"name":"server_w_port","title":"Server","breakpoints":"xs","style":{"word-break":"break-all"}},
{"name":"exclude","title":lang.excludes,"breakpoints":"all"},
{"name":"mins_interval","title":lang.mins_interval,"breakpoints":"all"},
{"name":"last_run","title":lang.last_run,"breakpoints":"all"},
{"name":"last_run","title":lang.last_run,"breakpoints":"sm"},
{"name":"log","title":"Log"},
{"name":"active","filterable": false,"style":{"maxWidth":"70px","width":"70px"},"title":lang.active},
{"name":"is_running","filterable": false,"style":{"maxWidth":"120px","width":"100px"},"title":lang.status},
@@ -774,7 +774,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'sync_job_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'sync_job_table');
paging_mailbox_after(ft, 'sync_job_table');
}
}
});
@@ -837,7 +837,7 @@ jQuery(function($){
table_mailbox_ready(ft, 'filter_table');
},
"after.ft.paging": function(e, ft){
table_mailbox_paging(ft, 'filter_table');
paging_mailbox_after(ft, 'filter_table');
}
}
});