From 25d7ada9b740594cf0a7e5feb56ac1fccc33436d Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 22 Sep 2014 17:13:19 -0600
Subject: [PATCH] Added some error message support

---
 classes/controller.php                | 17 ++++++++++++++++-
 themes/grav/templates/media.json.twig | 13 +++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/classes/controller.php b/classes/controller.php
index 348adeb9..f2b60a8a 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -140,8 +140,13 @@ class AdminController
     protected function taskListmedia()
     {
         $page = $this->admin->page(true);
-        $media_list = array();
 
+        if (!$page) {
+            $this->admin->json_response = ['error', 'No Page found'];
+            return;
+        }
+
+        $media_list = array();
         foreach ($page->media()->all() as $name=> $media) {
             $media_list[$name] = ['url'=>$media->url(),'size'=>$media->get('size')];
         }
@@ -164,6 +169,7 @@ class AdminController
 
             // If not a supported type, return
             if (!$config->get("media.{$fileExt}")) {
+                $this->admin->json_response = ['error', 'Unsupported file type: '.$fileExt];
                 return;
             }
 
@@ -171,7 +177,16 @@ class AdminController
             $targetPath = $page->path();
             $targetFile =  $targetPath.'/'.$targetName;
             move_uploaded_file($tempFile,$targetFile);
+            $this->admin->json_response = ['success', 'File uploaded successfully'];
+        } else {
+            $this->admin->json_response = ['error', 'No files found'];
         }
+        return;
+    }
+
+    protected function taskDelmedia()
+    {
+
     }
 
     /**
diff --git a/themes/grav/templates/media.json.twig b/themes/grav/templates/media.json.twig
index 706705f4..06461fcb 100644
--- a/themes/grav/templates/media.json.twig
+++ b/themes/grav/templates/media.json.twig
@@ -1,7 +1,8 @@
-{% if admin.task == 'listmedia' %}
-{{ admin.media|json_encode }}
-{% elseif admin.task == 'delmedia' %}
-deleted!
-{% elseif admin.task == 'addmedia' %}
-added!
+{% if admin.json_response %}
+{% set output = {'status':admin.json_response[0], 'message':admin.json_response[1] } %}
+{{ output|json_encode }}
+{% else %}
+    {% if admin.task == 'listmedia' %}
+    {{ admin.media|json_encode }}
+    {% endif %}
 {% endif %}