diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index da99ca650c..5583046484 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -352,6 +352,7 @@ tabs:
VM.attachdisk: true
VM.detachdisk: true
VM.disk_saveas: true
+ VM.disk_resize: true
VM.attachnic: true
VM.detachnic: true
VM.snapshot_create: true
diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml
index d5bd632345..230a0ccee8 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml
@@ -353,6 +353,7 @@ tabs:
VM.attachdisk: false
VM.detachdisk: false
VM.disk_saveas: false
+ VM.disk_resize: false
VM.attachnic: false
VM.detachnic: false
VM.snapshot_create: false
diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
index 10bcdde219..b772b8e9b0 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
@@ -353,6 +353,7 @@ tabs:
VM.attachdisk: false
VM.detachdisk: false
VM.disk_saveas: false
+ VM.disk_resize: false
VM.attachnic: false
VM.detachnic: false
VM.snapshot_create: false
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index f3a521c4b3..219138323b 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -352,6 +352,7 @@ tabs:
VM.attachdisk: true
VM.detachdisk: true
VM.disk_saveas: true
+ VM.disk_resize: false
VM.attachnic: true
VM.detachnic: true
VM.snapshot_create: true
diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js
index bd20453be1..a6e5523135 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js
@@ -313,9 +313,17 @@ define(function(require) {
if (Config.isTabActionEnabled("vms-tab", "VM.disk_resize")) {
if (StateActions.enabledStateAction("VM.disk_resize", that.element.STATE, that.element.LCM_STATE) && !disk.CONTEXT) {
- if(that.element.LCM_STATE != "3" || that.element.HISTORY_RECORDS.HISTORY.VM_MAD != "vcenter"){
- actions += ('\
- ');
+ if(Array.isArray(that.element.HISTORY_RECORDS.HISTORY)){
+ var historyLenght = that.element.HISTORY_RECORDS.HISTORY.length - 1;
+ if(that.element.LCM_STATE != "3" || that.element.HISTORY_RECORDS.HISTORY[historyLenght].VM_MAD != "vcenter"){
+ actions += ('\
+ ');
+ }
+ } else {
+ if(that.element.LCM_STATE != "3" || that.element.HISTORY_RECORDS.HISTORY.VM_MAD != "vcenter"){
+ actions += ('\
+ ');
+ }
}
}
}