From f844bf4b41bfe6301f5b6cf3ec195e2a1212e30c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 24 May 2016 01:10:05 -0700
Subject: [PATCH] Nicer focus handling for asset search

---
 app/Http/Controllers/AssetsController.php | 7 ++++++-
 resources/views/layouts/default.blade.php | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 9d1805ac4a..a9652b69b1 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -81,8 +81,13 @@ class AssetsController extends Controller
      * @return Redirect
      */
     public function getAssetByTag() {
+        if (Input::get('topsearch')=="true") {
+            $topsearch = true;
+        } else {
+            $topsearch = false;
+        }
         if ($asset = Asset::where('asset_tag','=',Input::get('assetTag'))->first()) {
-            return redirect()->route('view/hardware', $asset->id);
+            return redirect()->route('view/hardware', $asset->id)->with('topsearch', $topsearch);
         }
         return redirect()->to('hardware')->with('error',trans('admin/hardware/message.does_not_exist'));
 
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index c381b4beb2..4c5e2cf39e 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -575,10 +575,11 @@
 
     @section('moar_scripts')
     @show
-
+    @if ((Session::get('topsearch')=='true') || (Request::is('/')))
     <script>
-        // $("#tagSearch").focus();
+         $("#tagSearch").focus();
     </script>
+        @endif
 
   </body>
 </html>