From 4e74c553bd6c4d6072b10c2b5bbda7dc71f88a7c Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <parallelgrapefruit@gmail.com>
Date: Fri, 10 Jun 2016 07:33:33 -0500
Subject: [PATCH 1/3] Fix editing of assets. This also uses the asset form
 request for validation.

---
 app/Http/Controllers/AssetsController.php | 7 ++++---
 resources/views/hardware/edit.blade.php   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 236d28ebd..4221c8eae 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -296,7 +296,7 @@ class AssetsController extends Controller
     * @since [v1.0]
     * @return Redirect
     */
-    public function postEdit($assetId = null)
+    public function postEdit($assetId = null, AssetRequest $request)
     {
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
@@ -390,10 +390,11 @@ class AssetsController extends Controller
         // Was the asset updated?
         if ($asset->save()) {
             // Redirect to the new asset page
-            return redirect()->to("hardware/$assetId/view")->with('success', trans('admin/hardware/message.update.success'));
+            \Session::flash('success', trans('admin/hardware/message.update.success'));
+            return response()->json(['redirect_url' => route("view/hardware", $assetId)]);
         }
 
-        return redirect()->back()->withInput()->withErrors($asset->getErrors());
+        return response()->json(['errors' => $asset->getErrors()]);
 
     }
 
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index c03bc4236..d6627716f 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -511,7 +511,7 @@ $(function () {
       dataType: 'json',
       success: function(data) {
         // AssetController flashes success to session, redirect to hardware page.
-        window.location.href = successRoute;
+        window.location.href = data.redirect_url;
       },
       error: function(data) {
         // AssetRequest Validator will flash all errors to session, this just refreshes to see them.

From e9605891f3f48f9970e22776f7cac647bb0dea06 Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <parallelgrapefruit@gmail.com>
Date: Fri, 10 Jun 2016 07:44:45 -0500
Subject: [PATCH 2/3] Merge upstream and fix changes.

---
 app/Http/Controllers/AssetsController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 7ae1c205b..72b767f59 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -297,9 +297,8 @@ class AssetsController extends Controller
     * @return Redirect
     */
 
-    public function postEdit($assetId = null, AssetRequest $request)
+    public function postEdit(AssetRequest $request, $assetId = null)
     {
-        exit;
         // Check if the asset exists
         if (!$asset = Asset::find($assetId)) {
             // Redirect to the asset management page with error

From 2159d77fc249dc9f9a442fe909e523d458ef928a Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <parallelgrapefruit@gmail.com>
Date: Fri, 10 Jun 2016 07:46:38 -0500
Subject: [PATCH 3/3] No longer necessary.

---
 resources/views/hardware/edit.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 136623d76..9b429755d 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -501,7 +501,6 @@ $(function () {
 
   function sendForm() {
     var form = $("#create-form").get(0);
-    var successRoute = "{{route('hardware')}}";
     var formData = $('#create-form').serializeArray();
     formData.push({name:'image', value:imageData});
     $.ajax({