diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index b93b1819..e0b15017 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -2053,6 +2053,7 @@ jQuery(function($){ type: "GET", url: "/api/v1/get/syncjobs/all/no_log", dataSrc: function(json){ + console.log(json); $.each(json, function (i, item) { item.log = '' + lang.open_logs + '' item.user2 = escapeHtml(item.user2); @@ -2067,13 +2068,16 @@ jQuery(function($){ ' ' + lang.remove + '' + ''; item.chkbox = ''; - if (item.is_running == 1) { + + if (item.is_running == 1 && item.active == 1) { item.is_running = '' + lang.running + ''; - } else { + } else if (item.is_running == 0 && item.active == 1) { item.is_running = '' + lang.waiting + ''; + } else { + item.is_running = '' + lang.inactive + ''; } - if (!item.last_run > 0) { - item.last_run = lang.waiting; + if (!item.last_run) { + item.last_run = lang.never; } if (item.success == null) { item.success = '-'; @@ -2142,19 +2146,17 @@ jQuery(function($){ data: 'log', defaultContent: '' }, - { - title: lang.active, - data: 'active', - defaultContent: '', - render: function (data, type) { - return 1==data?'':0==data&&''; - } - }, { title: lang.status, data: 'is_running', defaultContent: '' }, + { + title: lang.encryption, + data: 'enc1', + defaultContent: '', + className: 'none' + }, { title: lang.excludes, data: 'exclude', diff --git a/data/web/js/site/user.js b/data/web/js/site/user.js index d1b9780f..8c06b5b1 100644 --- a/data/web/js/site/user.js +++ b/data/web/js/site/user.js @@ -127,6 +127,13 @@ jQuery(function($){ } } + $(".refresh_table").on('click', function(e) { + e.preventDefault(); + var table_name = $(this).data('table'); + + if ($.fn.DataTable.isDataTable('#' + table_name)) + $('#' + table_name).DataTable().ajax.reload(); + }); function draw_tla_table() { // just recalc width if instance already exists if ($.fn.DataTable.isDataTable('#tla_table') ) { @@ -254,13 +261,15 @@ jQuery(function($){ item.action = '-'; item.chkbox = ''; } - if (item.is_running == 1) { + if (item.is_running == 1 && item.active == 1) { item.is_running = '' + lang.running + ''; - } else { + } else if (item.is_running == 0 && item.active == 1) { item.is_running = '' + lang.waiting + ''; + } else { + item.is_running = '' + lang.inactive + ''; } - if (!item.last_run > 0) { - item.last_run = lang.waiting; + if (!item.last_run) { + item.last_run = lang.never; } if (item.success == null) { item.success = '-'; @@ -329,14 +338,6 @@ jQuery(function($){ data: 'log', defaultContent: '' }, - { - title: lang.active, - data: 'active', - defaultContent: '', - render: function (data, type) { - return 1==data?'':0==data&&'' - } - }, { title: lang.status, data: 'is_running', @@ -346,17 +347,20 @@ jQuery(function($){ { title: lang.encryption, data: 'enc1', - defaultContent: '' + defaultContent: '', + className: 'none' }, { title: lang.excludes, data: 'exclude', - defaultContent: '' + defaultContent: '', + className: 'none' }, { title: lang.interval + " (min)", data: 'mins_interval', - defaultContent: '' + defaultContent: '', + className: 'none' }, { title: lang.action, diff --git a/data/web/lang/lang.de-de.json b/data/web/lang/lang.de-de.json index 4f7feb5b..0346d3f4 100644 --- a/data/web/lang/lang.de-de.json +++ b/data/web/lang/lang.de-de.json @@ -771,6 +771,7 @@ "edit": "Bearbeiten", "empty": "Keine Einträge vorhanden", "enable_x": "Aktivieren", + "encryption": "Verschlüsselung", "excludes": "Ausschlüsse", "filter_table": "Filtern", "filters": "Filter", @@ -1175,6 +1176,7 @@ "recent_successful_connections": "Kürzlich erfolgreiche Verbindungen", "remove": "Entfernen", "running": "Wird ausgeführt", + "inactive": "Inaktiv", "save": "Änderungen speichern", "save_changes": "Änderungen speichern", "sender_acl_disabled": "Absenderprüfung deaktiviert", @@ -1220,7 +1222,7 @@ "user_settings": "Benutzereinstellungen", "username": "Benutzername", "verify": "Verifizieren", - "waiting": "Warte auf Ausführung", + "waiting": "Wartend", "week": "Woche", "weekly": "Wöchentlich", "weeks": "Wochen", diff --git a/data/web/lang/lang.en-gb.json b/data/web/lang/lang.en-gb.json index 5719049e..c8ff2972 100644 --- a/data/web/lang/lang.en-gb.json +++ b/data/web/lang/lang.en-gb.json @@ -779,6 +779,7 @@ "edit": "Edit", "empty": "No results", "enable_x": "Enable", + "encryption": "Encryption", "excludes": "Excludes", "filter_table": "Filter table", "filters": "Filters", @@ -1143,6 +1144,7 @@ "hour": "hour", "hourly": "Hourly", "hours": "hours", + "inactive": "Inactive", "in_use": "Used", "interval": "Interval", "is_catch_all": "Catch-all for domain/s", diff --git a/data/web/templates/user/Syncjobs.twig b/data/web/templates/user/Syncjobs.twig index 322e8536..e4744f1f 100644 --- a/data/web/templates/user/Syncjobs.twig +++ b/data/web/templates/user/Syncjobs.twig @@ -4,7 +4,11 @@ {{ lang.user.sync_jobs }} - {{ lang.user.sync_jobs }} + {{ lang.user.sync_jobs }} + + + {{ lang.admin.refresh }} +