Przeglądaj źródła

Merge branch 'master' of github.com:cloudbase/coriolis-web

Alessandro Pilotti 8 lat temu
rodzic
commit
a38cee44bd

+ 2 - 0
src/constants/CloudLabels.js

@@ -38,6 +38,8 @@ export const defaultLabels = {
   migr_image_name: "Migration Image Name",
   migr_image_name_map: "Migration Image Name Map",
   migr_image_id: "Migration Image ID",
+  migr_worker_use_config_drive: "Migration Worker use ConfigDrive",
+  migr_worker_use_fip: "Migration Worker use FIP",
   delete_disks_on_vm_termination: "Delete Disks on VM termination",
   set_dhcp: "Set DHCP",
   vm_size: "VM Size",

+ 1 - 1
src/stores/ConnectionsStore/ConnectionsStore.js

@@ -328,7 +328,7 @@ class ConnectionsStore extends Reflux.Store
               {label: "Yes", value: "true"},
               {label: "No", value: "false"}
             ]
-
+            field.default = field.default && "true"
             break
 
           case "string":

+ 1 - 1
src/stores/WizardStore/WizardStore.js

@@ -112,7 +112,7 @@ class WizardStore extends Reflux.Store
 
   onLoadInstanceDetail(endpoint, instance) {
     let projectId = Reflux.GlobalState.userStore.currentUser.project.id
-    let instanceNameBase64 = btoa(instance.name)
+    let instanceNameBase64 = btoa(instance.instance_name)
     let url = `${servicesUrl.coriolis}/${projectId}/endpoints/${endpoint.id}/instances/${instanceNameBase64}`
 
     Api.sendAjaxRequest({