replication: show disabled jobs and allow enabling/disabling

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/API2/Replication.pm b/PVE/API2/Replication.pm
index d25b744a968c152bd7bab773c4c5ec0c2fe2b614..154995089887af0e0cb4c5187a90e755839bf8a1 100644 (file)
--- a/PVE/API2/Replication.pm
+++ b/PVE/API2/Replication.pm
@@ -153,7 +153,7 @@ __PACKAGE__->register_method ({
        my $rpcenv = PVE::RPCEnvironment::get();
        my $authuser = $rpcenv->get_user();
 
-       my $jobs = PVE::ReplicationState::job_status();
+       my $jobs = PVE::ReplicationState::job_status(1);
 
        my $res = [];
        foreach my $id (sort keys %$jobs) {

diff --git a/www/manager6/grid/Replication.js b/www/manager6/grid/Replication.js
index e5c703fe18ea8389d61a6dd9d3d33ca52e2099ec..682da6598e0cc7866ad4e14a61bb3518652776d7 100644 (file)
--- a/www/manager6/grid/Replication.js
+++ b/www/manager6/grid/Replication.js
@@ -50,6 +50,13 @@ Ext.define('PVE.window.ReplicaEdit', {
                xtype: 'textfield',
                fieldLabel: gettext('Comment'),
                name: 'comment'
+           },
+           {
+               xtype: 'pvecheckbox',
+               name: 'enabled',
+               defaultValue: 'on',
+               checked: true,
+               fieldLabel: gettext('Enabled')
            }
        );
 
@@ -62,7 +69,11 @@ Ext.define('PVE.window.ReplicaEdit', {
                onGetValues: function(values) {
                    var me = this.up('window');
 
+                   values.disable = values.enabled ? 0 : 1;
+                   delete values.enabled;
+
                    PVE.Utils.delete_if_default(values, 'rate', '', me.isCreate);
+                   PVE.Utils.delete_if_default(values, 'disable', 0, me.isCreate);
                    PVE.Utils.delete_if_default(values, 'schedule', '*/15', me.isCreate);
                    PVE.Utils.delete_if_default(values, 'comment', '', me.isCreate);
 
@@ -109,6 +120,7 @@ Ext.define('PVE.window.ReplicaEdit', {
        } else {
            me.load({
                success: function(response, options) {
+                   response.result.data.enabled = !response.result.data.disable;
                    me.setValues(response.result.data);
                    me.digest = response.result.data.digest;
                }
@@ -290,6 +302,13 @@ Ext.define('PVE.grid.ReplicaView', {
        me.vmid = me.pveSelNode.data.vmid;
 
        me.columns = [
+           {
+               text: gettext('Enabled'),
+               dataIndex: 'enabled',
+               xtype: 'checkcolumn',
+               sortable: true,
+               disabled: true
+           },
            {
                text: gettext('ID'),
                dataIndex: 'id',
@@ -498,7 +517,9 @@ Ext.define('PVE.grid.ReplicaView', {
            'id', 'target', 'comment', 'rate', 'type',
            { name: 'guest', type: 'integer' },
            { name: 'jobnum', type: 'integer' },
-           { name: 'schedule', defaultValue: '*/15' }
+           { name: 'schedule', defaultValue: '*/15' },
+           { name: 'disable', defaultValue: '' },
+           { name: 'enabled', calculate: function(data) { return !data.disable; } }
        ]
     });