From fff44f46815fe35d9cd1dc9065f173ed6c9f6cfa Mon Sep 17 00:00:00 2001
From: KodeStar <admin@Xenon.local>
Date: Thu, 8 Feb 2018 20:00:24 +0000
Subject: [PATCH] fixes for saving non config items

---
 app/Http/Controllers/ItemController.php | 22 ++++++++++------------
 app/Item.php                            |  3 ++-
 public/js/app.js                        |  2 +-
 resources/assets/js/app.js              |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 78657390..1cc2a9a9 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -139,12 +139,11 @@ class ItemController extends Controller
             ]);
         }
 
-        $config = json_encode($request->input('config'));
-        if($config) {
-            $request->merge([
-                'description' => $config
-            ]);
-        }
+        $config = $request->input('config');
+        $config = (!empty($config)) ? json_encode($config) : null;
+        $request->merge([
+            'description' => $config
+        ]);
 
         //die(print_r($request->input('config')));
         
@@ -202,12 +201,11 @@ class ItemController extends Controller
             ]);
         }
         
-        $config = json_encode($request->input('config'));
-        if($config) {
-            $request->merge([
-                'description' => $config
-            ]);
-        }
+        $config = $request->input('config');
+        $config = (!empty($config)) ? json_encode($config) : null;
+        $request->merge([
+            'description' => $config
+        ]);
  
 
         Item::find($id)->update($request->all());
diff --git a/app/Item.php b/app/Item.php
index 3c306363..878937aa 100644
--- a/app/Item.php
+++ b/app/Item.php
@@ -61,8 +61,9 @@ class Item extends Model
                 $class = $output->type;
                 $sap = new $class();
                 $view = $sap->configDetails();
+                $output->view = $view;
             }
-            $output->view = $view;
+            
         }
         return (object)$output;
     }
diff --git a/public/js/app.js b/public/js/app.js
index 9fe33a66..aaf5f68a 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -23,7 +23,7 @@ $.when( $.ready ).then(function() {
             var container = $(this);
             var max_timer = 30000;
             var timer = 1000;
-        (function worker() {
+            (function worker() {
                 $.ajax({
                   url: '/get_stats/'+id, 
                   success: function(data) {
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 70caf5ac..ffe6c18a 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -14,7 +14,7 @@ $.when( $.ready ).then(function() {
             var container = $(this);
             var max_timer = 30000;
             var timer = 1000;
-        (function worker() {
+            (function worker() {
                 $.ajax({
                   url: '/get_stats/'+id, 
                   success: function(data) {