mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
Merge pull request #2147 from dmeltzer/Fix-Asset-Creation-with-old-data
Fix editing assets.
This commit is contained in:
commit
ac15fb9be9
|
@ -296,9 +296,9 @@ class AssetsController extends Controller
|
|||
* @since [v1.0]
|
||||
* @return Redirect
|
||||
*/
|
||||
public function postEdit(Request $request, $assetId = null)
|
||||
|
||||
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
|
||||
|
@ -388,10 +388,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()]);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -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({
|
||||
|
@ -512,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.
|
||||
|
|
Loading…
Reference in a new issue