gui: dc/backup: move renderers to Utils.js

Moving the following renderers to Utils.js to be able to use them in
more than one place:
* render_backup_days_of_week
* render_backup_selection

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index bb65b4de48d3d2a71fb5b207b8eec4949ea8d853..8295331abc391b7573e2e10eadca1044baa489d1 100644 (file)
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -219,6 +219,66 @@ Ext.define('PVE.Utils', { utilities: {
 
     },
 
+    render_backup_days_of_week: function(val) {
+       var dows = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
+       var selected = [];
+       var cur = -1;
+       val.split(',').forEach(function(day){
+           cur++;
+           var dow = (dows.indexOf(day)+6)%7;
+           if (cur === dow) {
+               if (selected.length === 0 || selected[selected.length-1] === 0) {
+                   selected.push(1);
+               } else {
+                   selected[selected.length-1]++;
+               }
+           } else {
+               while (cur < dow) {
+                   cur++;
+                   selected.push(0);
+               }
+               selected.push(1);
+           }
+       });
+
+       cur = -1;
+       var days = [];
+       selected.forEach(function(item) {
+           cur++;
+           if (item > 2) {
+               days.push(Ext.Date.dayNames[(cur+1)] + '-' + Ext.Date.dayNames[(cur+item)%7]);
+               cur += item-1;
+           } else if (item == 2) {
+               days.push(Ext.Date.dayNames[cur+1]);
+               days.push(Ext.Date.dayNames[(cur+2)%7]);
+               cur++;
+           } else if (item == 1) {
+               days.push(Ext.Date.dayNames[(cur+1)%7]);
+           }
+       });
+       return days.join(', ');
+    },
+
+    render_backup_selection: function(value, metaData, record) {
+       let allExceptText = gettext('All except {0}');
+       let allText = '-- ' + gettext('All') + ' --';
+       if (record.data.all) {
+           if (record.data.exclude) {
+               return Ext.String.format(allExceptText, record.data.exclude);
+           }
+           return allText;
+       }
+       if (record.data.vmid) {
+           return record.data.vmid;
+       }
+
+       if (record.data.pool) {
+           return "Pool '"+ record.data.pool + "'";
+       }
+
+       return "-";
+    },
+
     get_kvm_osinfo: function(value) {
        var info = { base: 'Other' }; // default
        if (value) {

diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
index 13cd0528c6f6b2855c88732f0bf5c4f577ee7954..1ef092c53a3e7a425aec553d422486004c2634f7 100644 (file)
--- a/www/manager6/dc/Backup.js
+++ b/www/manager6/dc/Backup.js
@@ -383,7 +383,6 @@ Ext.define('PVE.dc.BackupView', {
     onlineHelp: 'chapter_vzdump',
 
     allText: '-- ' + gettext('All') + ' --',
-    allExceptText: gettext('All except {0}'),
 
     initComponent : function() {
        var me = this;
@@ -568,45 +567,7 @@ Ext.define('PVE.dc.BackupView', {
                    width: 200,
                    sortable: false,
                    dataIndex: 'dow',
-                   renderer: function(val) {
-                       var dows = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
-                       var selected = [];
-                       var cur = -1;
-                       val.split(',').forEach(function(day){
-                           cur++;
-                           var dow = (dows.indexOf(day)+6)%7;
-                           if (cur === dow) {
-                               if (selected.length === 0 || selected[selected.length-1] === 0) {
-                                   selected.push(1);
-                               } else {
-                                   selected[selected.length-1]++;
-                               }
-                           } else {
-                               while (cur < dow) {
-                                   cur++;
-                                   selected.push(0);
-                               }
-                               selected.push(1);
-                           }
-                       });
-
-                       cur = -1;
-                       var days = [];
-                       selected.forEach(function(item) {
-                           cur++;
-                           if (item > 2) {
-                               days.push(Ext.Date.dayNames[(cur+1)] + '-' + Ext.Date.dayNames[(cur+item)%7]);
-                               cur += item-1;
-                           } else if (item == 2) {
-                               days.push(Ext.Date.dayNames[cur+1]);
-                               days.push(Ext.Date.dayNames[(cur+2)%7]);
-                               cur++;
-                           } else if (item == 1) {
-                               days.push(Ext.Date.dayNames[(cur+1)%7]);
-                           }
-                       });
-                       return days.join(', ');
-                   }
+                   renderer: PVE.Utils.render_backup_days_of_week
                },
                {
                    header: gettext('Start Time'),
@@ -625,23 +586,7 @@ Ext.define('PVE.dc.BackupView', {
                    flex: 1,
                    sortable: false,
                    dataIndex: 'vmid',
-                   renderer: function(value, metaData, record) {
-                       if (record.data.all) {
-                           if (record.data.exclude) {
-                               return Ext.String.format(me.allExceptText, record.data.exclude);
-                           }
-                           return me.allText;
-                       }
-                       if (record.data.vmid) {
-                           return record.data.vmid;
-                       }
-
-                       if (record.data.pool) {
-                           return "Pool '"+ record.data.pool + "'";
-                       }
-
-                       return "-";
-                   }
+                   renderer: PVE.Utils.render_backup_selection
                }
            ],
            listeners: {