DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes bug #3086 - unabel to create asset from asset model screen

Browse source
This commit is contained in:
snipe 2016-12-22 17:08:42 -08:00
parent d6b7036518
commit fc18aa7f6d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/AssetsController.php
View file

@ -106,10 +106,9 @@ class AssetsController extends Controller
* @param integer $model_id * @param integer $model_id
* @return View * @return View
*/ */
public function create($model_id = null) public function create(Request $request)
{ {
$this->authorize('create', Asset::class); $this->authorize('create', Asset::class);
// Grab the dropdown lists
$view = View::make('hardware/edit'); $view = View::make('hardware/edit');
$view->with('supplier_list', Helper::suppliersList()); $view->with('supplier_list', Helper::suppliersList());
$view->with('company_list', Helper::companyList()); $view->with('company_list', Helper::companyList());
@ -122,9 +121,10 @@ class AssetsController extends Controller
$view->with('category', Helper::categoryList('asset')); $view->with('category', Helper::categoryList('asset'));
$view->with('statuslabel_types', Helper::statusTypeList()); $view->with('statuslabel_types', Helper::statusTypeList());
if (!is_null($model_id)) { if ($request->has('model_id')) {
$selected_model = AssetModel::find($model_id); $selected_model = AssetModel::find($request->input('model_id'));
$view->with('selected_model', $selected_model); $view->with('selected_model', $selected_model);
} else {
} }
return $view; return $view;

2
resources/views/models/view.blade.php
View file

@ -17,7 +17,7 @@
@if ($model->deleted_at=='') @if ($model->deleted_at=='')
<li><a href="{{ route('models.edit', $model->id) }}">{{ trans('admin/models/table.edit') }}</a></li> <li><a href="{{ route('models.edit', $model->id) }}">{{ trans('admin/models/table.edit') }}</a></li>
<li><a href="{{ route('clone/model', $model->id) }}">{{ trans('admin/models/table.clone') }}</a></li> <li><a href="{{ route('clone/model', $model->id) }}">{{ trans('admin/models/table.clone') }}</a></li>
<li><a href="{{ route('hardware.create', $model->id) }}">{{ trans('admin/hardware/form.create') }}</a></li> <li><a href="{{ route('hardware.create', ['model_id' => $model->id]) }}">{{ trans('admin/hardware/form.create') }}</a></li>
@else @else
<li><a href="{{ route('restore/model', $model->id) }}">{{ trans('admin/models/general.restore') }}</a></li> <li><a href="{{ route('restore/model', $model->id) }}">{{ trans('admin/models/general.restore') }}</a></li>
@endif @endif