From a6b975b1687d16c1bd05953ad82f34e97ff2cca2 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 15 Dec 2016 06:11:03 -0800 Subject: [PATCH] More updates for #3060, #3058 --- .../Controllers/AssetModelsController.php | 32 ++++++------- app/Providers/RouteServiceProvider.php | 1 + resources/views/hardware/edit.blade.php | 6 +-- resources/views/layouts/default.blade.php | 48 +++++++++---------- resources/views/models/index.blade.php | 4 +- resources/views/models/view.blade.php | 2 +- routes/api.php | 7 +-- routes/web.php | 4 -- routes/web/models.php | 15 ++++++ 9 files changed, 66 insertions(+), 53 deletions(-) create mode 100644 routes/web/models.php diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index 73b0e5f690..b3f847c4a4 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -36,7 +36,7 @@ class AssetModelsController extends Controller * @since [v1.0] * @return View */ - public function getIndex() + public function index() { // Show the page return View::make('models/index'); @@ -49,7 +49,7 @@ class AssetModelsController extends Controller * @since [v1.0] * @return View */ - public function getCreate() + public function create() { // Show the page $depreciation_list = Helper::depreciationList(); @@ -117,7 +117,7 @@ class AssetModelsController extends Controller // Was it created? if ($model->save()) { // Redirect to the new model page - return redirect()->to("hardware/models")->with('success', trans('admin/models/message.create.success')); + return redirect()->route("models.index")->with('success', trans('admin/models/message.create.success')); } return redirect()->back()->withInput()->withErrors($model->getErrors()); @@ -132,7 +132,7 @@ class AssetModelsController extends Controller * @since [v2.0] * @return String JSON */ - public function store() + public function apiStore() { //COPYPASTA!!!! FIXME $model = new AssetModel; @@ -170,7 +170,7 @@ class AssetModelsController extends Controller * @param int $modelId * @return View */ - public function getEdit($modelId = null) + public function edit($modelId = null) { // Check if the model exists if (is_null($item = AssetModel::find($modelId))) { @@ -199,7 +199,7 @@ class AssetModelsController extends Controller * @param int $modelId * @return Redirect */ - public function postEdit($modelId = null) + public function update($modelId = null) { // Check if the model exists if (is_null($model = AssetModel::find($modelId))) { @@ -252,14 +252,14 @@ class AssetModelsController extends Controller // Was it created? if ($model->save()) { // Redirect to the new model page - return redirect()->to("hardware/models")->with('success', trans('admin/models/message.update.success')); + return redirect()->route("models.index")->with('success', trans('admin/models/message.update.success')); } else { return redirect()->back()->withInput()->withErrors($model->getErrors()); } // Redirect to the model create page - return redirect()->to("hardware/models/$modelId/edit")->with('error', trans('admin/models/message.update.error')); + return redirect()->route('models.create')->with('error', trans('admin/models/message.update.error')); } @@ -272,7 +272,7 @@ class AssetModelsController extends Controller * @param int $modelId * @return Redirect */ - public function getDelete($modelId) + public function destroy($modelId) { // Check if the model exists if (is_null($model = AssetModel::find($modelId))) { @@ -282,14 +282,14 @@ class AssetModelsController extends Controller if ($model->assets->count() > 0) { // Throw an error that this model is associated with assets - return redirect()->to('hardware/models')->with('error', trans('admin/models/message.assoc_users')); + return redirect()->route('models.index')->with('error', trans('admin/models/message.assoc_users')); } else { // Delete the model $model->delete(); // Redirect to the models management page - return redirect()->to('hardware/models')->with('success', trans('admin/models/message.delete.success')); + return redirect()->route('models.index')->with('success', trans('admin/models/message.delete.success')); } } @@ -317,7 +317,7 @@ class AssetModelsController extends Controller $success = trans('admin/models/message.restore.success'); // Redirect back - return redirect()->back()->with('success', $success); + return redirect()->route('models.index')->with('success', $success); } else { return redirect()->back()->with('error', trans('admin/models/message.not_found')); @@ -334,7 +334,7 @@ class AssetModelsController extends Controller * @param int $modelId * @return View */ - public function getView($modelId = null) + public function show($modelId = null) { $model = AssetModel::withTrashed()->find($modelId); @@ -345,7 +345,7 @@ class AssetModelsController extends Controller $error = trans('admin/models/message.does_not_exist', compact('id')); // Redirect to the user management page - return redirect()->route('models')->with('error', $error); + return redirect()->route('models.index')->with('error', $error); } @@ -452,7 +452,7 @@ class AssetModelsController extends Controller foreach ($models as $model) { if ($model->deleted_at == '') { - $actions = '
'; + $actions = '
'; } else { $actions = ''; } @@ -460,7 +460,7 @@ class AssetModelsController extends Controller $rows[] = array( 'id' => $model->id, 'manufacturer' => (string)link_to('/admin/settings/manufacturers/'.$model->manufacturer->id.'/view', $model->manufacturer->name), - 'name' => (string)link_to('/hardware/models/'.$model->id.'/view', $model->name), + 'name' => (string)link_to_route('models.show',$model->name, ['model' => $model->id]), 'image' => ($model->image!='') ? '' : '', 'modelnumber' => $model->model_number, 'numassets' => $model->assets->count(), diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 63cdd9397c..791911b004 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -56,6 +56,7 @@ class RouteServiceProvider extends ServiceProvider 'namespace' => $this->namespace, ], function ($router) { require base_path('routes/web/hardware.php'); + require base_path('routes/web/models.php'); require base_path('routes/web/accessories.php'); require base_path('routes/web/licenses.php'); require base_path('routes/web/consumables.php'); diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 90b888fbb1..570483a09a 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -144,7 +144,7 @@ if ($item->id && $item->assetloc) { if(modelid=='') { $('#custom_fields_content').html(""); } else { - $.get("{{URL::to('/') }}/hardware/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) { + $.get("{{URL::to('/') }}/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) { $('#custom_fields_content').html(data); }); } @@ -168,7 +168,7 @@ if ($item->id && $item->assetloc) { if(status_id!=''){ $(".status_spinner").css("display", "inline"); $.ajax({ - url: "{{URL::to('/') }}/api/statuslabels/"+status_id+"/deployable", + url: "{{URL::to('/') }}/api/v1/statuslabels/"+status_id+"/deployable", success: function(data) { $(".status_spinner").css("display", "none"); @@ -372,7 +372,7 @@ $(function () { data._token = '{{ csrf_token() }}', //console.dir(data); - $.post("{{URL::to('/') }}/api/"+model+"s",data,function (result) { + $.post("{{URL::to('/') }}/api/v1/"+model+"s",data,function (result) { var id=result.id; var name=result.name || (result.first_name+" "+result.last_name); $('.modal-body input:visible').val(""); diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 2caed9f66a..5077fa5896 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -136,14 +136,14 @@ @endcan @can('licenses.view') -
  • +
    • @endcan @can('accessories.view') -
  • +
  • @@ -157,7 +157,7 @@
    • @endcan @can('components.view') -
  • +
  • @@ -194,7 +194,7 @@
    • @endcan @can('licenses.create') -
  • +
  • @lang('general.license') @@ -215,14 +215,14 @@
    • @endcan @can('users.create') -
  • +
  • @lang('general.user')
    • @endcan @can('components.create') -
  • +
  • @lang('general.component') @@ -316,57 +316,57 @@