mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-05 16:25:39 +00:00
Code Issues Projects Releases Wiki Activity

Use updated redirect() reference

Browse Source
This commit is contained in:
snipe
2016-04-28 21:06:41 -07:00
parent 8dd0e72284
commit ba01b20ad4
23 changed files with 375 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Http/Controllers/LocationsController.php
View File

@ -99,10 +99,10 @@ class LocationsController extends Controller
if ($location->save()) {
// Redirect to the new location page
return Redirect::to("admin/settings/locations")->with('success', trans('admin/locations/message.create.success'));
return redirect()->to("admin/settings/locations")->with('success', trans('admin/locations/message.create.success'));
}
return Redirect::back()->withInput()->withErrors($location->getErrors());
return redirect()->back()->withInput()->withErrors($location->getErrors());
}
@ -160,7 +160,7 @@ class LocationsController extends Controller
{
// Check if the location exists
if (is_null($location = Location::find($locationId))) {
return Redirect::to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
}
// Show the page
@ -187,7 +187,7 @@ class LocationsController extends Controller
// Check if the location exists
if (is_null($location = Location::find($locationId))) {
// Redirect to the blogs management page
return Redirect::to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.does_not_exist'));
}
// Update the location data
@ -208,11 +208,11 @@ class LocationsController extends Controller
// Was the asset created?
if ($location->save()) {
// Redirect to the saved location page
return Redirect::to("admin/settings/locations/")->with('success', trans('admin/locations/message.update.success'));
return redirect()->to("admin/settings/locations/")->with('success', trans('admin/locations/message.update.success'));
}
// Redirect to the location management page
return Redirect::back()->withInput()->withInput()->withErrors($location->getErrors());
return redirect()->back()->withInput()->withInput()->withErrors($location->getErrors());
}
@ -229,21 +229,21 @@ class LocationsController extends Controller
// Check if the location exists
if (is_null($location = Location::find($locationId))) {
// Redirect to the blogs management page
return Redirect::to('admin/settings/locations')->with('error', trans('admin/locations/message.not_found'));
return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.not_found'));
}
if ($location->users->count() > 0) {
return Redirect::to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_users'));
return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_users'));
} elseif ($location->childLocations->count() > 0) {
return Redirect::to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_child_loc'));
return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_child_loc'));
} elseif ($location->assets->count() > 0) {
return Redirect::to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_assets'));
return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_assets'));
} elseif ($location->assignedassets->count() > 0) {
return Redirect::to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_assets'));
return redirect()->to('admin/settings/locations')->with('error', trans('admin/locations/message.assoc_assets'));
} else {
$location->delete();
return Redirect::to('admin/settings/locations')->with('success', trans('admin/locations/message.delete.success'));
return redirect()->to('admin/settings/locations')->with('success', trans('admin/locations/message.delete.success'));
}
@ -273,7 +273,7 @@ class LocationsController extends Controller
$error = trans('admin/locations/message.does_not_exist', compact('id'));
// Redirect to the user management page
return Redirect::route('locations')->with('error', $error);
return redirect()->route('locations')->with('error', $error);
}