Merge remote-tracking branch 'origin/4.18'

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java

@@ -59,7 +59,6 @@ import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.GuestOSVO;
 import com.cloud.storage.Snapshot;
 import com.cloud.storage.SnapshotVO;
-import com.cloud.storage.Storage;
 import com.cloud.storage.VolumeApiService;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.SnapshotDao;
@@ -360,10 +359,6 @@ public class StorageVMSnapshotStrategy extends DefaultVMSnapshotStrategy {
 
     @Override
     public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
-        //This check could be removed when PR #5297 is merged
-        if (vmHasNFSOrLocalVolumes(vmId)) {
-            return StrategyPriority.CANT_HANDLE;
-        }
         if (SnapshotManager.VmStorageSnapshotKvm.value() && !snapshotMemory) {
             UserVmVO vm = userVmDao.findById(vmId);
             if (vm.getState() == VirtualMachine.State.Running) {
@@ -465,17 +460,4 @@ public class StorageVMSnapshotStrategy extends DefaultVMSnapshotStrategy {
         payload.setQuiescevm(false);
         return payload;
     }
-
-    private boolean vmHasNFSOrLocalVolumes(long vmId) {
-        List<VolumeObjectTO> volumeTOs = vmSnapshotHelper.getVolumeTOList(vmId);
-
-        for (VolumeObjectTO volumeTO : volumeTOs) {
-            Long poolId = volumeTO.getPoolId();
-            Storage.StoragePoolType poolType = vmSnapshotHelper.getStoragePoolType(poolId);
-            if (poolType == Storage.StoragePoolType.NetworkFilesystem || poolType == Storage.StoragePoolType.Filesystem) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

ui/public/locales/en.json

@@ -1299,6 +1299,7 @@
 "label.move.to.bottom": "Move to bottom",
 "label.move.to.top": "Move to top",
 "label.move.up.row": "Move up one row",
+"label.my.isos": "My ISOs",
 "label.my.templates": "My templates",
 "label.na": "N/A",
 "label.name": "Name",

ui/src/views/compute/wizard/TemplateIsoSelection.vue

@@ -56,6 +56,10 @@ export default {
   name: 'TemplateIsoSelection',
   components: { TemplateIsoRadioGroup },
   props: {
+    selected: {
+      type: String,
+      default: null
+    },
     items: {
       type: Object,
       default: () => {}
@@ -85,7 +89,7 @@ export default {
         name: 'label.community'
       }, {
         id: 'selfexecutable',
-        name: 'label.my.templates'
+        name: this.selected === 'isoid' ? 'label.my.isos' : 'label.my.templates'
       }, {
         id: 'sharedexecutable',
         name: 'label.sharedexecutable'

ui/src/views/dashboard/UsageDashboard.vue

@@ -413,7 +413,7 @@ export default {
       (newValue, oldValue) => {
         if (newValue && newValue.id && (!oldValue || newValue.id !== oldValue.id)) {
           this.fetchData()
-        } else if (store.getters.userInfo.roletype !== 'Admin') {
+        } else if (store.getters.userInfo.roletype !== 'Admin' && !store.getters.logoutFlag) {
           this.fetchData()
         }
       }