konevsa/pve-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correctly check for undefined values

Browse Source
This commit is contained in:
Dietmar Maurer
2015-01-08 13:14:39 +01:00
parent c838c7a36f
commit 0910943185
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
www/manager/qemu/HardwareView.js
View File

@ -286,7 +286,10 @@ Ext.define('PVE.qemu.HardwareView', {
selModel: sm,
disabled: true,
enableFn: function(rec) {
if (!rec || rec.data.key.match(/^unused\d+/) || rec.data['pending'] || rec.data['delete']) {
if (!rec || rec.data.key.match(/^unused\d+/) || rec.data['delete']) {
return false;
}
if (Ext.isDefined(rec.data.pending) && (rec.data.pending !== '')) {
return false;
}
var rowdef = rows[rec.data.key];
@ -344,7 +347,7 @@ Ext.define('PVE.qemu.HardwareView', {
if (!rec) {
return false;
}
if(rec.data['delete']){
if (rec.data['delete']) {
return false;
}
var rowdef = rows[rec.data.key];
@ -363,7 +366,7 @@ Ext.define('PVE.qemu.HardwareView', {
reload();
},
failure: function (response, opts) {
Ext.Msg.alert('Error',response.htmlStatus);
Ext.Msg.alert('Error', response.htmlStatus);
}
});
}
@ -377,12 +380,16 @@ Ext.define('PVE.qemu.HardwareView', {
if (!rec) {
return false;
}
if(!rec.data['pending'] && !rec.data['delete']){
return false;
}
var rowdef = rows[rec.data.key];
return true;
if (Ext.isDefined(rec.data.pending) && (rec.data.pending !== '')) {
return true;
}
if (rec.data['delete']) {
return true;
}
return false;
},
handler: function(b, e, rec) {
PVE.Utils.API2Request({

7
www/manager/qemu/Options.js
View File

@ -338,9 +338,10 @@ Ext.define('PVE.qemu.Options', {
return;
}
if(rec.data['pending'] || rec.data['delete']){
revert_btn.setDisabled(false);
}else {
if ((Ext.isDefined(rec.data.pending) && (rec.data.pending !== '')) ||
rec.data['delete']) {
revert_btn.setDisabled(false);
} else {
revert_btn.setDisabled(true);
}