allow to abort verify jobs

And improve job description rendering on gui.
This commit is contained in:
Dietmar Maurer
2020-06-25 12:55:34 +02:00
parent 4bd789b0fa
commit 8ea00f6e49
3 changed files with 60 additions and 25 deletions

View File

@ -38,8 +38,9 @@ Ext.define('PBS.Utils', {
let datastore = result[1], type = result[2], id = result[3];
return `Datastore ${datastore} - ${what} ${type}/${id}`;
}
return what;
return `Datastore ${id} - ${what}`;
},
render_datastore_time_worker_id: function(id, what) {
const res = id.match(/^(\S+)_([^_\s]+)_([^_\s]+)_([^_\s]+)$/);
if (res) {
@ -62,6 +63,9 @@ Ext.define('PBS.Utils', {
prune: (type, id) => {
return PBS.Utils.render_datastore_worker_id(id, gettext('Prune'));
},
verify: (type, id) => {
return PBS.Utils.render_datastore_worker_id(id, gettext('Verify'));
},
backup: (type, id) => {
return PBS.Utils.render_datastore_worker_id(id, gettext('Backup'));
},