From cffe8332fc9c5e7072e5ce923d57eea65ca12ff0 Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andysh.uk>
Date: Fri, 12 Jul 2019 07:26:02 +0100
Subject: [PATCH] #123: Display list of storages on the Image Processing tab

---
 app/Http/Controllers/Admin/DefaultController.php     | 8 ++++++++
 resources/views/themes/base/admin/settings.blade.php | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/DefaultController.php b/app/Http/Controllers/Admin/DefaultController.php
index 794f750..ade187d 100644
--- a/app/Http/Controllers/Admin/DefaultController.php
+++ b/app/Http/Controllers/Admin/DefaultController.php
@@ -368,9 +368,17 @@ class DefaultController extends Controller
 
         $themeNamesLookup = UserConfig::allowedThemeNames();
 
+        // Storage sources for the Image Processing tab
+        $storageSources = [];
+        foreach (Storage::where('is_active', true)->orderBy('name')->get() as $storage)
+        {
+            $storageSources[$storage->id] = $storage->name;
+        }
+
         return Theme::render('admin.settings', [
             'config' => $config,
             'date_formats' => $dateFormatsLookup,
+            'storage_sources' => $storageSources,
             'success' => $request->session()->get('success'),
             'theme_names' => $themeNamesLookup
         ]);
diff --git a/resources/views/themes/base/admin/settings.blade.php b/resources/views/themes/base/admin/settings.blade.php
index 964ae3a..335364a 100644
--- a/resources/views/themes/base/admin/settings.blade.php
+++ b/resources/views/themes/base/admin/settings.blade.php
@@ -208,7 +208,9 @@
                                     <div class="form-group">
                                         <label class="form-control-label" for="analysis-queue-storage-location">Analysis queue storage:</label>
                                         <select class="form-control{{ $errors->has('analysis_queue_storage_location') ? ' is-invalid' : '' }}" id="analysis-queue-storage-location" name="analysis_queue_storage_location">
-                                            <option value="{{ old('analysis_queue_storage_location', $config['analysis_queue_storage_location']) }}"></option>
+                                            @foreach ($storage_sources as $key => $value)
+                                                <option value="{{ $key }}"{{ $key == old('analysis_queue_storage_location', $config['analysis_queue_storage_location']) ? ' selected="selected"' : '' }}>{{ $value }}</option>
+                                            @endforeach
                                         </select>
 
                                         @if ($errors->has('analysis_queue_storage_location'))