DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Nicer focus handling for asset search

Browse source
This commit is contained in:
snipe 2016-05-24 01:10:05 -07:00
parent 6e006a6873
commit f844bf4b41
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/AssetsController.php
View file

@ -81,8 +81,13 @@ class AssetsController extends Controller
* @return Redirect * @return Redirect
*/ */
public function getAssetByTag() { public function getAssetByTag() {
if (Input::get('topsearch')=="true") {
$topsearch = true;
} else {
$topsearch = false;
}
if ($asset = Asset::where('asset_tag','=',Input::get('assetTag'))->first()) { 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')); return redirect()->to('hardware')->with('error',trans('admin/hardware/message.does_not_exist'));

5
resources/views/layouts/default.blade.php
View file

@ -575,10 +575,11 @@
@section('moar_scripts') @section('moar_scripts')
@show @show
@if ((Session::get('topsearch')=='true') || (Request::is('/')))
<script> <script>
// $("#tagSearch").focus(); $("#tagSearch").focus();
</script> </script>
@endif
</body> </body>
</html> </html>