ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed routes.

Browse Source
This commit is contained in:
snipe
2013-11-16 09:33:30 -05:00
parent 173a7d120f
commit ffe786f659
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+8 -8
View File
@@ -91,11 +91,11 @@ class AssetsController extends AdminController {
if($asset->save())
{
// Redirect to the asset listing page
return Redirect::to("assets/assets")->with('success', Lang::get('admin/assets/message.create.success'));
return Redirect::to("admin")->with('success', Lang::get('admin/assets/message.create.success'));
}
// Redirect to the asset create page with an error
return Redirect::to('assets/assets/create')->with('error', Lang::get('admin/assets/message.create.error'));
return Redirect::to('assets/create')->with('error', Lang::get('admin/assets/message.create.error'));
}
/**
@@ -110,7 +110,7 @@ class AssetsController extends AdminController {
if (is_null($asset = Asset::find($assetId)))
{
// Redirect to the asset management page
return Redirect::to('admin/settings/assets')->with('error', Lang::get('admin/assets/message.does_not_exist'));
return Redirect::to('admin')->with('error', Lang::get('admin/assets/message.does_not_exist'));
}
// Grab the dropdown list of models
@@ -134,7 +134,7 @@ class AssetsController extends AdminController {
if (is_null($asset = Asset::find($assetId)))
{
// Redirect to the asset management page with error
return Redirect::to('admin/assets')->with('error', Lang::get('admin/assets/message.does_not_exist'));
return Redirect::to('admin')->with('error', Lang::get('admin/assets/message.does_not_exist'));
}
// Declare the rules for the form validation
@@ -170,11 +170,11 @@ class AssetsController extends AdminController {
if($asset->save())
{
// Redirect to the new asset page
return Redirect::to("assets/assets/$assetId/edit")->with('success', Lang::get('admin/assets/message.update.success'));
return Redirect::to("assets/$assetId/edit")->with('success', Lang::get('admin/assets/message.update.success'));
}
// Redirect to the asset management page with error
return Redirect::to("assets/assets/$assetId/edit")->with('error', Lang::get('admin/assets/message.update.error'));
return Redirect::to("assets/$assetId/edit")->with('error', Lang::get('admin/assets/message.update.error'));
}
/**
@@ -189,14 +189,14 @@ class AssetsController extends AdminController {
if (is_null($asset = Asset::find($assetId)))
{
// Redirect to the asset management page with error
return Redirect::to('assets/assets')->with('error', Lang::get('admin/assets/message.not_found'));
return Redirect::to('admin')->with('error', Lang::get('admin/assets/message.not_found'));
}
// Delete the asset
$asset->delete();
// Redirect to the asset management page
return Redirect::to('assets/assets')->with('success', Lang::get('admin/assets/message.delete.success'));
return Redirect::to('admin')->with('success', Lang::get('admin/assets/message.delete.success'));
}
app/routes.php
+1 -6
View File
@@ -14,11 +14,6 @@
Route::group(array('prefix' => 'assets'), function()
{
# Assets
Route::group(array('prefix' => 'assets'), function()
{
Route::get('/', array('as' => 'assets', 'uses' => 'Controllers\Admin\AssetsController@getIndex'));
Route::get('assets', array('as' => 'assets', 'uses' => 'Controllers\Admin\AssetsController@getIndex'));
Route::get('create', array('as' => 'create/asset', 'uses' => 'Controllers\Admin\AssetsController@getCreate'));
@@ -26,7 +21,7 @@ Route::group(array('prefix' => 'assets'), function()
Route::get('{assetId}/edit', array('as' => 'update/asset', 'uses' => 'Controllers\Admin\AssetsController@getEdit'));
Route::post('{assetId}/edit', 'Controllers\Admin\AssetsController@postEdit');
Route::get('{assetId}/delete', array('as' => 'delete/asset', 'uses' => 'Controllers\Admin\AssetsController@getDelete'));
});
# Asset Model Management
Route::group(array('prefix' => 'models'), function()
app/views/backend/locations/index.blade.php
+1 -1
View File
@@ -10,7 +10,7 @@ Asset Depreciations ::
@section('content')
<div class="page-header">
<h3>
Asset Depreciations
Locations
<div class="pull-right">
<a href="{{ route('create/location') }}" class="btn btn-small btn-info"><i class="icon-plus-sign icon-white"></i> Create</a>