ui: datastore: use safe destroy as base for dialog
only ask the name of the current NS, not the full NS path to avoid too long input requirements on deep levels. needs a few smaller hacks, ideally we would pull out the basic stuff from Edit window in some EditBase window and let both, SafeDestroy and Edit window derive from that, for better common, in sync features. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
3aafa61362
commit
3d2baf4170
|
@ -385,6 +385,7 @@ Ext.define('PBS.Utils', {
|
||||||
'barcode-label-media': [gettext('Drive'), gettext('Barcode-Label Media')],
|
'barcode-label-media': [gettext('Drive'), gettext('Barcode-Label Media')],
|
||||||
'catalog-media': [gettext('Drive'), gettext('Catalog Media')],
|
'catalog-media': [gettext('Drive'), gettext('Catalog Media')],
|
||||||
'delete-datastore': [gettext('Datastore'), gettext('Remove Datastore')],
|
'delete-datastore': [gettext('Datastore'), gettext('Remove Datastore')],
|
||||||
|
'delete-namespace': [gettext('Namespace'), gettext('Remove Namespace')],
|
||||||
dircreate: [gettext('Directory Storage'), gettext('Create')],
|
dircreate: [gettext('Directory Storage'), gettext('Create')],
|
||||||
dirremove: [gettext('Directory'), gettext('Remove')],
|
dirremove: [gettext('Directory'), gettext('Remove')],
|
||||||
'eject-media': [gettext('Drive'), gettext('Eject Media')],
|
'eject-media': [gettext('Drive'), gettext('Eject Media')],
|
||||||
|
|
|
@ -573,14 +573,14 @@ Ext.define('PBS.DataStoreContent', {
|
||||||
console.warn('forgetNamespace called with root NS!');
|
console.warn('forgetNamespace called with root NS!');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let parentNS = view.namespace.split('/').slice(0, -1).join('/');
|
let nsParts = view.namespace.split('/');
|
||||||
|
let nsName = nsParts.pop();
|
||||||
|
let parentNS = nsParts.join('/');
|
||||||
|
|
||||||
Ext.create('PBS.window.NamespaceDelete', {
|
Ext.create('PBS.window.NamespaceDelete', {
|
||||||
title: Ext.String.format(gettext("Destroy Namespace '{0}'"), view.namespace),
|
|
||||||
url: `/admin/datastore/${view.datastore}/namespace`,
|
|
||||||
datastore: view.datastore,
|
datastore: view.datastore,
|
||||||
namespace: view.namespace,
|
namespace: view.namespace,
|
||||||
autoShow: true,
|
item: { id: nsName },
|
||||||
apiCallDone: success => {
|
apiCallDone: success => {
|
||||||
if (success) {
|
if (success) {
|
||||||
view.namespace = parentNS; // move up before reload to avoid "ENOENT" error
|
view.namespace = parentNS; // move up before reload to avoid "ENOENT" error
|
||||||
|
|
|
@ -8,7 +8,7 @@ Ext.define('PBS.window.NamespaceEdit', {
|
||||||
isCreate: true,
|
isCreate: true,
|
||||||
subject: gettext('Namespace'),
|
subject: gettext('Namespace'),
|
||||||
// avoid that the trigger of the combogrid fields open on window show
|
// avoid that the trigger of the combogrid fields open on window show
|
||||||
defaultFocus: 'proxmoxHelpButton',
|
defaultFocus: 'proxmoxtextfield[name=name]',
|
||||||
|
|
||||||
cbind: {
|
cbind: {
|
||||||
url: '/api2/extjs/admin/datastore/{datastore}/namespace',
|
url: '/api2/extjs/admin/datastore/{datastore}/namespace',
|
||||||
|
@ -53,46 +53,35 @@ Ext.define('PBS.window.NamespaceEdit', {
|
||||||
});
|
});
|
||||||
|
|
||||||
Ext.define('PBS.window.NamespaceDelete', {
|
Ext.define('PBS.window.NamespaceDelete', {
|
||||||
extend: 'Proxmox.window.Edit',
|
extend: 'Proxmox.window.SafeDestroy',
|
||||||
xtype: 'pbsNamespaceDelete',
|
xtype: 'pbsNamespaceDelete',
|
||||||
mixins: ['Proxmox.Mixin.CBind'],
|
mixins: ['Proxmox.Mixin.CBind'],
|
||||||
|
|
||||||
//onlineHelp: 'namespaces', // TODO
|
|
||||||
|
|
||||||
viewModel: {},
|
viewModel: {},
|
||||||
|
|
||||||
isRemove: true,
|
autoShow: true,
|
||||||
isCreate: true, // because edit window is, well, a bit stupid..
|
taskName: 'delete-namespace',
|
||||||
title: gettext('Destroy Namespace'),
|
|
||||||
// avoid that the trigger of the combogrid fields open on window show
|
|
||||||
defaultFocus: 'proxmoxHelpButton',
|
|
||||||
|
|
||||||
cbind: {
|
cbind: {
|
||||||
url: '/api2/extjs/admin/datastore/{datastore}/namespace',
|
url: '/api2/extjs/admin/datastore/{datastore}/namespace',
|
||||||
},
|
},
|
||||||
method: 'DELETE',
|
additionalItems: [
|
||||||
|
|
||||||
width: 450,
|
|
||||||
|
|
||||||
items: {
|
|
||||||
xtype: 'inputpanel',
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
xtype: 'displayfield',
|
|
||||||
name: 'ns',
|
|
||||||
fieldLabel: gettext('Namespace'),
|
|
||||||
cbind: {
|
|
||||||
value: '{namespace}',
|
|
||||||
datastore: '{datastore}',
|
|
||||||
},
|
|
||||||
submitValue: true,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
xtype: 'proxmoxcheckbox',
|
xtype: 'proxmoxcheckbox',
|
||||||
name: 'delete-groups',
|
name: 'delete-groups',
|
||||||
reference: 'rmGroups',
|
reference: 'rmGroups',
|
||||||
boxLabel: gettext('Delete all Backup Groups'),
|
boxLabel: gettext('Delete all Backup Groups'),
|
||||||
value: false,
|
value: false,
|
||||||
|
listeners: {
|
||||||
|
change: function(field, value) {
|
||||||
|
let win = field.up('proxmoxSafeDestroy');
|
||||||
|
if (value) {
|
||||||
|
win.params['delete-groups'] = value;
|
||||||
|
} else {
|
||||||
|
delete win.params['delete-groups'];
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
xtype: 'box',
|
xtype: 'box',
|
||||||
|
@ -104,5 +93,12 @@ Ext.define('PBS.window.NamespaceDelete', {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
|
initComponent: function() {
|
||||||
|
let me = this;
|
||||||
|
me.title = Ext.String.format(gettext("Destroy Namespace '{0}'"), me.namespace);
|
||||||
|
me.params = { ns: me.namespace };
|
||||||
|
|
||||||
|
me.callParent();
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue