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

This commit is contained in:
snipe 2016-06-10 00:48:33 -07:00
commit 4e1472f66d
2 changed files with 2 additions and 3 deletions

View file

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

View file

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