v3.8.0

matthewalanpenning · matthewalanpenning · commit 31f878a58655 · 2023-08-31T05:02:29.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v3.8.0
+- Added a check for a null config in storage pools
+- Added image token cleanup with downloading images while in a cluster
+
+
 # v3.7.0
 - Set console/exec terminal height to 25 rows because xterm.js defaults to 24 and lxd defaults to 25 there was a single row mismatch
 - Added qemu.conf to virtual machine configuration options
diff --git a/lxd-dashboard/backend/config/about.php b/lxd-dashboard/backend/config/about.php
@@ -43,7 +43,7 @@
 <body class="">
   <p>The open source LXD Dashboard is developed by LXDWARE and provides a web-based user interface capable of managing multiple LXD servers from a single location.</p>
   <p>
-    <strong>Version</strong>: <span id="versionNumber">v3.7.0</span> <br />
+    <strong>Version</strong>: <span id="versionNumber">v3.8.0</span> <br />
     <strong>License</strong>: AGPL-3.0 <br />
     <strong>URL</strong>: https://lxdware.com <br />
   </p>
diff --git a/lxd-dashboard/backend/lxd/operations.php b/lxd-dashboard/backend/lxd/operations.php
@@ -144,6 +144,13 @@
               case "Updating instance":
                 $results .= " " . $instance; 
                 break;
+              case "Image download token":
+                #Remove image tokens left over from image downloads when in a cluster
+                if ($running_task['may_cancel'] == true){
+                  $url = $base_url . "/1.0/operations/" . $running_task['id'];
+                  $results = sendCurlRequest($action, "DELETE", $url);
+                }
+                break;
             }
           }
         }
diff --git a/lxd-dashboard/backend/lxd/storage-pools.php b/lxd-dashboard/backend/lxd/storage-pools.php
@@ -453,7 +453,7 @@
             echo '"' . htmlentities($storage_pool['driver']) . '",';
             echo '"' . htmlentities($storage_pool['status']) . '",';
 
-            if(array_key_exists('source', $storage_pool['config']))
+            if(isset($storage_pool['config']) && array_key_exists('source', $storage_pool['config']))
               $storage_pool_source = (isset($storage_pool['config']['source'])) ? $storage_pool['config']['source'] : "N/A";
             else
               $storage_pool_source = "N/A";

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,13 @@`
`144`	`144`	`case "Updating instance":`
`145`	`145`	`$results .= " " . $instance;`
`146`	`146`	`break;`
	`147`	`+ case "Image download token":`
	`148`	`+ #Remove image tokens left over from image downloads when in a cluster`
	`149`	`+ if ($running_task['may_cancel'] == true){`
	`150`	`+ $url = $base_url . "/1.0/operations/" . $running_task['id'];`
	`151`	`+ $results = sendCurlRequest($action, "DELETE", $url);`
	`152`	`+ }`
	`153`	`+ break;`
`147`	`154`	`}`
`148`	`155`	`}`
`149`	`156`	`}`