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

Merge remote-tracking branch 'origin/v3' into v3-master

Browse source
This commit is contained in:
snipe 2016-06-10 00:48:33 -07:00
parent f44d98924d c6ca1748cb
commit 4e1472f66d
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Requests/AssetRequest.php
View file

@ -55,8 +55,7 @@ class AssetRequest extends Request
{ {
$this->session()->flash('errors', Session::get('errors', new \Illuminate\Support\ViewErrorBag) $this->session()->flash('errors', Session::get('errors', new \Illuminate\Support\ViewErrorBag)
->put('default', new \Illuminate\Support\MessageBag($errors))); ->put('default', new \Illuminate\Support\MessageBag($errors)));
\Input::flash();
return parent::response($errors); return parent::response($errors);
// return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
} }
} }

2
resources/views/hardware/edit.blade.php
View file

@ -516,7 +516,7 @@ $(function () {
}, },
error: function(data) { error: function(data) {
// AssetRequest Validator will flash all errors to session, this just refreshes to see them. // AssetRequest Validator will flash all errors to session, this just refreshes to see them.
window.location.reload(); window.location.reload(true);
} }
}); });