diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs index 16b16dd8..04631d92 100644 --- a/pbs-api-types/src/jobs.rs +++ b/pbs-api-types/src/jobs.rs @@ -649,9 +649,6 @@ impl SyncJobConfig { status: { type: JobScheduleStatus, }, - direction: { - type: SyncDirection, - }, }, )] #[derive(Serialize, Deserialize, Clone, PartialEq)] @@ -662,9 +659,6 @@ pub struct SyncJobStatus { pub config: SyncJobConfig, #[serde(flatten)] pub status: JobScheduleStatus, - - /// The direction of the job - pub direction: SyncDirection, } /// These are used separately without `ns`/`max-depth` sometimes in the API, specifically in the API diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs index 089e6f50..6722ebea 100644 --- a/src/api2/admin/sync.rs +++ b/src/api2/admin/sync.rs @@ -120,7 +120,6 @@ pub fn list_config_sync_jobs( list.push(SyncJobStatus { config: job, status, - direction, }); } diff --git a/www/config/SyncView.js b/www/config/SyncView.js index ca1f7ecd..503bdc6d 100644 --- a/www/config/SyncView.js +++ b/www/config/SyncView.js @@ -45,7 +45,7 @@ Ext.define('PBS.config.SyncJobView', { store.clearFilter(); - let fieldsToSearch = ['direction', 'id', 'remote', 'remote-store', 'owner']; + let fieldsToSearch = ['sync-direction', 'id', 'remote', 'remote-store', 'owner']; if (!view.datastore) { fieldsToSearch.push('store'); } @@ -96,7 +96,7 @@ Ext.define('PBS.config.SyncJobView', { Ext.create('PBS.window.SyncJobEdit', { datastore: view.datastore, id: selection[0].data.id, - syncDirection: selection[0].data.direction, + syncDirection: selection[0].data['sync-direction'], listeners: { destroy: function() { me.reload(); @@ -174,7 +174,7 @@ Ext.define('PBS.config.SyncJobView', { type: 'diff', autoDestroy: true, autoDestroyRstore: true, - sorters: ['store', 'direction', 'id'], + sorters: ['store', 'sync-direction', 'id'], rstore: { type: 'update', storeid: 'pbs-sync-jobs-status', @@ -277,15 +277,15 @@ Ext.define('PBS.config.SyncJobView', { }, { header: gettext('Direction'), - dataIndex: 'direction', + dataIndex: 'sync-direction', renderer: function(value) { let iconCls, text; - if (value === 'pull') { - iconCls = 'download'; - text = gettext('Pull'); - } else { + if (value === 'push') { iconCls = 'upload'; text = gettext('Push'); + } else { + iconCls = 'download'; + text = gettext('Pull'); } return ` ${text}`; },