Merge pull request #222 from guydavis/develop

Support paths in Worker volume paths.
guydavis · Aug 13, 2021 · 87b92d3 · 87b92d3
2 parents 0e96125 + 16d0a61
commit 87b92d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
@@ -181,7 +181,7 @@
                 } else if (!volume_container_path) {
                     errors.push("Empty container path provided for volume at '" + volume_host_path + "'. Please provide a container path.");
                 }
-                cmd += '    -v ' + volume_host_path + ':' + volume_container_path + line_end;
+                cmd += '    -v "' + volume_host_path + ':' + volume_container_path + '"' + line_end;
                 if ($('#volume_type' + index).val() == 'plots') {
                     plots_dir.push(volume_container_path)
                 }
@@ -260,7 +260,7 @@
             $('#volumes').children().each((index, element) => {
                 volume_host_path = document.getElementById("volume_host_path" + index).value;
                 volume_container_path = document.getElementById("volume_container_path" + index).value;
-                cmd += '            - ' + volume_host_path + ':' + volume_container_path + line_end;
+                cmd += '            - "' + volume_host_path + ':' + volume_container_path + '"' + line_end;
                 if ($('#volume_type' + index).val() == 'plots') {
                     plots_dir.push(volume_container_path)
                 }

diff --git a/web/templates/workers.html b/web/templates/workers.html
@@ -68,16 +68,10 @@
       </table>
 
       <fieldset>
-        <div class="row g-3">
-          <div class="col-sm">
             <button form="workers-form" type="submit" name="action" value="prune" class="btn btn-outline-success"
               id="btnPrune" title="Only deletes status of selected worker(s).">Prune Selected</button>
-          </div>
-          <div class="col-sm-1">
-            <button type="button" class="text-right btn btn-outline-success"
-              onclick="WorkerLaunch(); return false">New</button>
-          </div>
-        </div>
+            <button type="button" class="btn btn-outline-success"
+              onclick="WorkerLaunch(); return false">New Worker</button>
       </fieldset>
   </form>