From db97869472822237cb1f7d8453a836fbf1719359 Mon Sep 17 00:00:00 2001 From: goodygh Date: Tue, 11 Apr 2023 23:18:13 +0200 Subject: [PATCH 01/16] Datatable hide sorting value --- data/web/css/build/011-datatables.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/web/css/build/011-datatables.css b/data/web/css/build/011-datatables.css index d03514ff..d262f07c 100644 --- a/data/web/css/build/011-datatables.css +++ b/data/web/css/build/011-datatables.css @@ -342,6 +342,10 @@ div.dataTables_wrapper div.dt-row { position: relative; } +div.dataTables_wrapper span.sorting-value { + display: none; +} + div.dataTables_scrollHead table.dataTable { margin-bottom: 0 !important; } From 800a0ace71c7b7ad5c0964df538faec7b4df8654 Mon Sep 17 00:00:00 2001 From: goodygh Date: Tue, 11 Apr 2023 23:19:56 +0200 Subject: [PATCH 02/16] Fix sorting for active domain in domains table --- data/web/js/site/mailbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index f4039268..22c8a900 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -607,7 +607,7 @@ jQuery(function($){ defaultContent: '', responsivePriority: 6, render: function (data, type) { - return 1==data?'':(0==data?'':2==data&&'—'); + return 1==data?'1':(0==data?'0':2==data&&'—'); } }, { From bd0b4a521ec5be122dc7402975fc304a520d852f Mon Sep 17 00:00:00 2001 From: goodygh Date: Tue, 11 Apr 2023 23:42:43 +0200 Subject: [PATCH 03/16] Fix sorting datatable in domain templates --- data/web/js/site/mailbox.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 22c8a900..b7349d4f 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -754,7 +754,7 @@ jQuery(function($){ data: 'attributes.gal', defaultContent: '', render: function (data, type) { - return 1==data?'':''; + return 1==data?'1':'0'; } }, { @@ -762,7 +762,7 @@ jQuery(function($){ data: 'attributes.backupmx', defaultContent: '', render: function (data, type) { - return 1==data?'':''; + return 1==data?'1':'0'; } }, { @@ -770,7 +770,7 @@ jQuery(function($){ data: 'attributes.relay_all_recipients', defaultContent: '', render: function (data, type) { - return 1==data?'':''; + return 1==data?'1':'0'; } }, { @@ -778,7 +778,7 @@ jQuery(function($){ data: 'attributes.relay_unknown_only', defaultContent: '', render: function (data, type) { - return 1==data?'':''; + return 1==data?'1':'0'; } }, { @@ -787,7 +787,7 @@ jQuery(function($){ defaultContent: '', responsivePriority: 4, render: function (data, type) { - return 1==data?'':''; + return 1==data?'1':'0'; } }, { From c3ed01c9b59069eb62b87362f8bcf15d30c83216 Mon Sep 17 00:00:00 2001 From: goodygh Date: Tue, 11 Apr 2023 23:49:50 +0200 Subject: [PATCH 04/16] Fix sorting for active mailboxes --- data/web/js/site/mailbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index b7349d4f..bebbd3fd 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -1093,7 +1093,7 @@ jQuery(function($){ defaultContent: '', responsivePriority: 4, render: function (data, type) { - return 1==data?'':(0==data?'':2==data&&'—'); + return 1==data?'1':(0==data?'0':2==data&&'—'); } }, { From a9dc13d567022361a3a4eb88d6d36273134a8516 Mon Sep 17 00:00:00 2001 From: goodygh Date: Wed, 12 Apr 2023 00:15:16 +0200 Subject: [PATCH 05/16] Fix sorting datatable in mailbox templates --- data/web/js/site/mailbox.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index bebbd3fd..43adbfc2 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -1164,13 +1164,13 @@ jQuery(function($){ item.attributes.quota = humanFileSize(item.attributes.quota); - item.attributes.tls_enforce_in = ''; - item.attributes.tls_enforce_out = ''; - item.attributes.pop3_access = ''; - item.attributes.imap_access = ''; - item.attributes.smtp_access = ''; - item.attributes.sieve_access = ''; - item.attributes.sogo_access = ''; + item.attributes.tls_enforce_in = '' + (item.attributes.tls_enforce_in == 1 ? '1' : '0') + ''; + item.attributes.tls_enforce_out = '' + (item.attributes.tls_enforce_out == 1 ? '1' : '0') + ''; + item.attributes.pop3_access = '' + (item.attributes.pop3_access == 1 ? '1' : '0') + ''; + item.attributes.imap_access = '' + (item.attributes.imap_access == 1 ? '1' : '0') + ''; + item.attributes.smtp_access = '' + (item.attributes.smtp_access == 1 ? '1' : '0') + ''; + item.attributes.sieve_access = '' + (item.attributes.sieve_access == 1 ? '1' : '0') + ''; + item.attributes.sogo_access = '' + (item.attributes.sogo_access == 1 ? '1' : '0') + ''; if (item.attributes.quarantine_notification === 'never') { item.attributes.quarantine_notification = lang.never; } else if (item.attributes.quarantine_notification === 'hourly') { @@ -1188,7 +1188,6 @@ jQuery(function($){ item.attributes.quarantine_category = lang.q_all; } - if (item.template.toLowerCase() == "default"){ item.action = '
' + ' ' + lang.edit + '' + @@ -1329,7 +1328,7 @@ jQuery(function($){ defaultContent: '', responsivePriority: 4, render: function (data, type) { - return 1==data?'':(0==data?'':2==data&&'—'); + return 1==data?'1':(0==data?'0':2==data&&'—'); } }, { From 025279009dc7db57f938631c72ec3e2287c04964 Mon Sep 17 00:00:00 2001 From: goodygh Date: Wed, 12 Apr 2023 00:17:41 +0200 Subject: [PATCH 06/16] Fix sorting for active resources --- data/web/js/site/mailbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 43adbfc2..75f37bfa 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -1439,7 +1439,7 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - return 1==data?'':(0==data?'':2==data&&'—'); + return 1==data?'1':(0==data?'0':2==data&&'—'); } }, { From c737ff418030431d8562cd87c62034d63fa31ecc Mon Sep 17 00:00:00 2001 From: goodygh Date: Wed, 12 Apr 2023 00:21:27 +0200 Subject: [PATCH 07/16] Fix sorting datatable in aliases --- data/web/js/site/mailbox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 75f37bfa..0dd88964 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -1916,7 +1916,7 @@ jQuery(function($){ data: 'sogo_visible', defaultContent: '', render: function(data, type){ - return 1==data?'':0==data&&''; + return 1==data?'1':0==data&&'0'; } }, { @@ -1935,7 +1935,7 @@ jQuery(function($){ defaultContent: '', responsivePriority: 6, render: function (data, type) { - return 1==data?'':0==data&&''; + return 1==data?'1':0==data&&'0'; } }, { From 44585e1c15fe014870b015735cf4cdd707327af0 Mon Sep 17 00:00:00 2001 From: goodygh Date: Wed, 12 Apr 2023 00:23:53 +0200 Subject: [PATCH 08/16] Fix sorting datatable in domain aliases --- data/web/js/site/mailbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 0dd88964..738565b2 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -2030,7 +2030,7 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - return 1==data?'':0==data&&''; + return 1==data?'1':0==data&&'0'; } }, { From 96f954a4e2b591cb8b9e1a2ad61f055fe50a1989 Mon Sep 17 00:00:00 2001 From: goodygh Date: Wed, 12 Apr 2023 00:36:46 +0200 Subject: [PATCH 09/16] Fix sorting for active syncjobs --- data/web/js/site/mailbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 738565b2..75662742 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -2166,7 +2166,7 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - return 1==data?'':0==data&&''; + return 1==data?'1':0==data&&'0'; } }, { From 78a8fac6afadbbcaa0672ccb34092b45221ca45f Mon Sep 17 00:00:00 2001 From: goodygh Date: Thu, 13 Apr 2023 18:10:21 +0200 Subject: [PATCH 10/16] Fix sorting for active bcc-map and recipient-map --- data/web/js/site/mailbox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 75662742..8ed1ec6a 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -1577,7 +1577,7 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - return 1==data?'':(0==data?'':2==data&&'—'); + return 1==data?'1':(0==data?'0':2==data&&'—'); } }, { @@ -1674,7 +1674,7 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - return 1==data?'':0==data&&''; + return 1==data?'1':0==data&&'0'; } }, { From 3fe8aaa719081abe058e87ac92cfe7ace812b1b9 Mon Sep 17 00:00:00 2001 From: goodygh Date: Thu, 13 Apr 2023 18:14:18 +0200 Subject: [PATCH 11/16] Fix sorting for active tls-policy-map --- data/web/js/site/mailbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js index 8ed1ec6a..9edd7c59 100644 --- a/data/web/js/site/mailbox.js +++ b/data/web/js/site/mailbox.js @@ -1781,7 +1781,7 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - return 1==data?'':0==data&&''; + return 1==data?'1':0==data&&'0'; } }, { From d9dfe15253ccadfd2df4ba388507ee090d56c035 Mon Sep 17 00:00:00 2001 From: goodygh Date: Thu, 13 Apr 2023 18:54:08 +0200 Subject: [PATCH 12/16] Fix sorting for active and tla on domain-admins --- data/web/js/site/admin.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/web/js/site/admin.js b/data/web/js/site/admin.js index 23ef1d25..cf5ffccd 100644 --- a/data/web/js/site/admin.js +++ b/data/web/js/site/admin.js @@ -117,8 +117,8 @@ jQuery(function($){ data: 'tfa_active', defaultContent: '', render: function (data, type) { - if(data == 1) return ''; - else return ''; + if(data == 1) return '1'; + else return '0'; } }, { @@ -126,8 +126,8 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - if(data == 1) return ''; - else return ''; + if(data == 1) return '1'; + else return '0'; } }, { From 7bfef57894df79731f3c3c530a924ebfc3d64516 Mon Sep 17 00:00:00 2001 From: goodygh Date: Thu, 13 Apr 2023 18:54:59 +0200 Subject: [PATCH 13/16] Fix sorting for active and tla on admins --- data/web/js/site/admin.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/web/js/site/admin.js b/data/web/js/site/admin.js index cf5ffccd..0326482d 100644 --- a/data/web/js/site/admin.js +++ b/data/web/js/site/admin.js @@ -260,8 +260,8 @@ jQuery(function($){ data: 'tfa_active', defaultContent: '', render: function (data, type) { - if(data == 1) return ''; - else return ''; + if(data == 1) return '1'; + else return '0'; } }, { @@ -269,8 +269,8 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - if(data == 1) return ''; - else return ''; + if(data == 1) return '1'; + else return '0'; } }, { From 99739eada05b3304f727c6ee7148187a3161c301 Mon Sep 17 00:00:00 2001 From: goodygh Date: Thu, 13 Apr 2023 19:01:03 +0200 Subject: [PATCH 14/16] Fix sorting for active fowrardinghoststable --- data/web/js/site/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/js/site/admin.js b/data/web/js/site/admin.js index 0326482d..b2b7e416 100644 --- a/data/web/js/site/admin.js +++ b/data/web/js/site/admin.js @@ -337,7 +337,7 @@ jQuery(function($){ data: 'keep_spam', defaultContent: '', render: function(data, type){ - return 'yes'==data?'':'no'==data&&''; + return 'yes'==data?'yes':'no'==data&&'no'; } }, { From 236d627fbd6eef3e7559d77b4329ee6db6a02bde Mon Sep 17 00:00:00 2001 From: goodygh Date: Thu, 13 Apr 2023 19:14:20 +0200 Subject: [PATCH 15/16] Fix sorting for active transport map --- data/web/js/site/admin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/js/site/admin.js b/data/web/js/site/admin.js index b2b7e416..f1e4c688 100644 --- a/data/web/js/site/admin.js +++ b/data/web/js/site/admin.js @@ -492,8 +492,8 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - if(data == 1) return ''; - else return ''; + if(data == 1) return '1'; + else return '0'; } }, { From 3510d5617d8f82d4dcf785aa71e78d7a8e949d2a Mon Sep 17 00:00:00 2001 From: goodygh Date: Thu, 13 Apr 2023 19:18:04 +0200 Subject: [PATCH 16/16] Fix sorting for active relayhost --- data/web/js/site/admin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/js/site/admin.js b/data/web/js/site/admin.js index f1e4c688..07dfed8c 100644 --- a/data/web/js/site/admin.js +++ b/data/web/js/site/admin.js @@ -414,8 +414,8 @@ jQuery(function($){ data: 'active', defaultContent: '', render: function (data, type) { - if(data == 1) return ''; - else return ''; + if(data == 1) return '1'; + else return '0'; } }, {