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

Added Inactive Badge for Syncjobs + Parity with user view

Browse Source
This commit is contained in:
Niklas Meyer
2023-01-20 15:11:25 +01:00
parent 2ebd8345df
commit 735989f6cf
5 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 = '<a href="#syncjobLogModal" data-bs-toggle="modal" data-syncjob-id="' + encodeURIComponent(item.id) + '">' + lang.open_logs + '</a>'
item.user2 = escapeHtml(item.user2);
@@ -2067,13 +2068,16 @@ jQuery(function($){
'<a href="#" data-action="delete_selected" data-id="single-syncjob" data-api-url="delete/syncjob" data-item="' + item.id + '" class="btn btn-sm btn-xs-half btn-danger"><i class="bi bi-trash"></i> ' + lang.remove + '</a>' +
'</div>';
item.chkbox = '<input type="checkbox" data-id="syncjob" name="multi_select" value="' + item.id + '" />';
if (item.is_running == 1) {
if (item.is_running == 1 && item.active == 1) {
item.is_running = '<span id="active-script" class="badge fs-6 bg-success">' + lang.running + '</span>';
} else {
} else if (item.is_running == 0 && item.active == 1) {
item.is_running = '<span id="inactive-script" class="badge fs-6 bg-warning">' + lang.waiting + '</span>';
} else {
item.is_running = '<span id="inactive-script" class="badge fs-6 bg-danger">' + lang.inactive + '</span>';
}
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?'<i class="bi bi-check-lg"></i>':0==data&&'<i class="bi bi-x-lg"></i>';
}
},
{
title: lang.status,
data: 'is_running',
defaultContent: ''
},
{
title: lang.encryption,
data: 'enc1',
defaultContent: '',
className: 'none'
},
{
title: lang.excludes,
data: 'exclude',

34
data/web/js/site/user.js
View File

@@ -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 = '<span>-</span>';
item.chkbox = '<input type="checkbox" disabled />';
}
if (item.is_running == 1) {
if (item.is_running == 1 && item.active == 1) {
item.is_running = '<span id="active-script" class="badge fs-6 bg-success">' + lang.running + '</span>';
} else {
} else if (item.is_running == 0 && item.active == 1) {
item.is_running = '<span id="inactive-script" class="badge fs-6 bg-warning">' + lang.waiting + '</span>';
} else {
item.is_running = '<span id="disabled-script" class="badge fs-6 bg-danger">' + lang.inactive + '</span>';
}
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?'<i class="bi bi-check-lg"></i>':0==data&&'<i class="bi bi-x-lg"></i>'
}
},
{
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,