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

More updates for #3060, #3058

Browse source
This commit is contained in:
snipe 2016-12-15 06:11:03 -08:00
parent 8faffb1889
commit a6b975b168
9 changed files with 66 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/Http/Controllers/AssetModelsController.php
View file

@ -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 = '<div style=" white-space: nowrap;"><a href="'.route('clone/model', $model->id).'" class="btn btn-info btn-sm" title="Clone Model" data-toggle="tooltip"><i class="fa fa-clone"></i></a> <a href="'.route('update/model', $model->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/model', $model->id).'" data-content="'.trans('admin/models/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($model->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
$actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/model', $model->id).'" class="btn btn-info btn-sm" title="Clone Model" data-toggle="tooltip"><i class="fa fa-clone"></i></a> <a href="'.route('models.edit', ['model' => $model->id]).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('models.destroy', ['model' => $model->id]).'" data-content="'.trans('admin/models/message.delete.confirm').'" data-title="'.trans('general.delete').' '.htmlspecialchars($model->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
} else {
$actions = '<a href="'.route('restore/model', $model->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
}
@ -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!='') ? '<img src="'.\URL::to('/').'/uploads/models/'.$model->image.'" height=50 width=50>' : '',
'modelnumber' => $model->model_number,
'numassets' => $model->assets->count(),

1
app/Providers/RouteServiceProvider.php
View file

@ -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');

6
resources/views/hardware/edit.blade.php
View file

@ -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("");

48
resources/views/layouts/default.blade.php
View file

@ -136,14 +136,14 @@
</li>
@endcan
@can('licenses.view')
<li {!! (Request::is('admin/licenses*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
<a href="{{ route('licenses.create') }}">
<i class="fa fa-floppy-o"></i>
</a>
</li>
@endcan
@can('accessories.view')
<li {!! (Request::is('admin/accessories*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
<a href="{{ route('accessories.index') }}">
<i class="fa fa-keyboard-o"></i>
</a>
@ -157,7 +157,7 @@
</li>
@endcan
@can('components.view')
<li {!! (Request::is('admin/components*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('components*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/components') }}">
<i class="fa fa-hdd-o"></i>
</a>
@ -194,7 +194,7 @@
</li>
@endcan
@can('licenses.create')
<li {!! (Request::is('admin/licenses/create') ? 'class="active"' : '') !!}>
<li {!! (Request::is('licenses/create') ? 'class="active"' : '') !!}>
<a href="{{ route('create/licenses') }}">
<i class="fa fa-floppy-o fa-fw"></i>
@lang('general.license')</a>
@ -215,14 +215,14 @@
</li>
@endcan
@can('users.create')
<li {!! (Request::is('admin/users/create') ? 'class="active"' : '') !!}>
<li {!! (Request::is('users/create') ? 'class="active"' : '') !!}>
<a href="{{ route('create/user') }}">
<i class="fa fa-user fa-fw"></i>
@lang('general.user')</a>
</li>
@endcan
@can('components.create')
<li {!! (Request::is('admin/components/create') ? 'class="active"' : '') !!}>
<li {!! (Request::is('components/create') ? 'class="active"' : '') !!}>
<a href="{{ route('create/component') }}">
<i class="fa fa-hdd-o"></i>
@lang('general.component')</a>
@ -316,57 +316,57 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li {!! (Request::is('admin/settings/companies*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('settings/companies*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/companies') }}">
<i class="fa fa-building-o fa-fw"></i> @lang('general.companies')
</a>
</li>
<li {!! (Request::is('hardware/models*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('hardware/models') }}">
<li {!! (Request::is('models*') ? ' class="active"' : '') !!}>
<a href="{{ route('models.index') }}">
<i class="fa fa-th fa-fw"></i> @lang('general.asset_models')
</a>
</li>
<li {!! (Request::is('admin/settings/categories*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('settings/categories*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/categories') }}">
<i class="fa fa-check fa-fw"></i> @lang('general.categories')
</a>
</li>
<li {!! (Request::is('admin/settings/manufacturers*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('settings/manufacturers*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/manufacturers') }}">
<i class="fa fa-briefcase fa-fw"></i> @lang('general.manufacturers')
</a>
</li>
<li {!! (Request::is('admin/settings/suppliers*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('settings/suppliers*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/suppliers') }}">
<i class="fa fa-credit-card fa-fw"></i> @lang('general.suppliers')
</a>
</li>
<li {!! (Request::is('admin/settings/statuslabels*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('settings/statuslabels*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/statuslabels') }}">
<i class="fa fa-list fa-fw"></i> @lang('general.status_labels')
</a>
</li>
<li {!! (Request::is('admin/settings/depreciations*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('settings/depreciations*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/depreciations') }}">
<i class="fa fa-arrow-down fa-fw"></i> @lang('general.depreciation')
</a>
</li>
<li {!! (Request::is('admin/settings/locations*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('settings/locations*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/locations') }}">
<i class="fa fa-globe fa-fw"></i> @lang('general.locations')
</a>
</li>
<li {!! (Request::is('admin/groups*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('groups*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/groups') }}">
<i class="fa fa-group fa-fw"></i> @lang('general.groups')
</a>
</li>
<li {!! (Request::is('admin/settings/backups*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('settings/backups*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/backups') }}">
<i class="fa fa-download fa-fw"></i> @lang('admin/settings/general.backups')
</a>
</li>
<li {!! (Request::is('admin/custom_fields*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('custom_fields*') ? ' class="active"' : '') !!}>
<a href="{{ route('admin.custom_fields.index') }}">
<i class="fa fa-wrench fa-fw"></i> @lang('admin/custom_fields/general.custom_fields')
</a>
@ -445,8 +445,8 @@
@endcan
@can('superuser')
<li{!! (Request::is('hardware/models*') ? ' class="active"' : '') !!}><a href="{{ URL::to('hardware/models') }}">@lang('general.asset_models')</a></li>
<li><a href="{{ URL::to('admin/settings/categories') }}" {!! (Request::is('admin/settings/categories*') ? ' class="active"' : '') !!} >@lang('general.categories')</a></li>
<li{!! (Request::is('hardware/models*') ? ' class="active"' : '') !!}><a href="{{ route('models.index') }}">@lang('general.asset_models')</a></li>
<li><a href="{{ URL::to('admin/settings/categories') }}" {!! (Request::is('settings/categories*') ? ' class="active"' : '') !!} >@lang('general.categories')</a></li>
@endcan
@can('assets.create')
<li{!! (Request::query('Deleted') ? ' class="active"' : '') !!}><a href="{{ URL::to('hardware?status=Deleted') }}">@lang('general.deleted')</a></li>
@ -458,7 +458,7 @@
</li>
@endcan
@can('licenses.view')
<li{!! (Request::is('admin/licenses*') ? ' class="active"' : '') !!}>
<li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
<a href="{{ route('licenses.create') }}">
<i class="fa fa-floppy-o"></i>
<span>@lang('general.licenses')</span>
@ -466,7 +466,7 @@
</li>
@endcan
@can('accessories.view')
<li{!! (Request::is('admin/accessories*') ? ' class="active"' : '') !!}>
<li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
<a href="{{ route('accessories.index') }}">
<i class="fa fa-keyboard-o"></i>
<span>@lang('general.accessories')</span>
@ -482,7 +482,7 @@
</li>
@endcan
@can('components.view')
<li{!! (Request::is('admin/components*') ? ' class="active"' : '') !!}>
<li{!! (Request::is('components*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/components') }}">
<i class="fa fa-hdd-o"></i>
<span>@lang('general.components')</span>
@ -490,7 +490,7 @@
</li>
@endcan
@can('users.view')
<li{!! (Request::is('admin/users*') ? ' class="active"' : '') !!}>
<li{!! (Request::is('users*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/users') }}">
<i class="fa fa-users"></i>
<span>@lang('general.people')</span>

4
resources/views/models/index.blade.php
View file

@ -11,7 +11,7 @@
@if(Input::get('status')=='Deleted')
<a href="{{ URL::to('hardware/models') }}" class="btn btn-default pull-right" style="margin-right:5px;"><i class="fa fa-trash"></i> {{ trans('admin/models/general.view_models') }}</a>
@else
<a href="{{ route('create/model') }}" class="btn btn-primary pull-right">
<a href="{{ route('models.create') }}" class="btn btn-primary pull-right">
{{ trans('general.create') }}</a>
<a href="{{ URL::to('hardware/models?status=Deleted') }}" class="btn btn-default pull-right" style="margin-right:5px;"><i class="fa fa-trash"></i> {{ trans('admin/models/general.view_deleted') }}</a>
@endif
@ -30,7 +30,7 @@
name="models"
class="table table-striped snipe-table"
id="table"
data-url="{{ route('api.models.list',array('status'=>e(Input::get('status')))) }}"
data-url="{{ route('api.models.index',array('status'=>e(Input::get('status')))) }}"
data-cookie="true"
data-click-to-select="true"
data-cookie-id-table="modelsTable-{{ config('version.hash_version') }}">

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

@ -15,7 +15,7 @@
</button>
<ul class="dropdown-menu">
@if ($model->deleted_at=='')
<li><a href="{{ route('update/model', $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('hardware.create', $model->id) }}">{{ trans('admin/hardware/form.create') }}</a></li>
@else

7
routes/api.php
View file

@ -138,12 +138,13 @@ Route::group(['prefix' => 'v1', 'middleware' => 'auth:api'], function () {
/*---Models API---*/
Route::group([ 'prefix' => 'models' ], function () {
Route::resource('/', 'AssetModelsController');
Route::get('list/{status?}', [ 'as' => 'api.models.list', 'uses' => 'AssetModelsController@getDatatable' ]);
Route::get('/{status?}', [ 'as' => 'api.models.index', 'uses' => 'AssetModelsController@getDatatable' ]);
Route::get('{modelID}/view', [ 'as' => 'api.models.view', 'uses' => 'AssetModelsController@getDataView' ]);
});
/*--- Categories API---*/
Route::group([ 'prefix' => 'categories' ], function () {

4
routes/web.php
View file

@ -15,10 +15,6 @@ Route::resource('fields', 'CustomFieldsController', [
/*
|--------------------------------------------------------------------------
| Log Routes

15
routes/web/models.php Normal file
View file

@ -0,0 +1,15 @@
<?php
# Asset Model Management
Route::group([ 'prefix' => 'models', 'middleware' => ['auth'] ], function () {
Route::get('{modelId}/clone', [ 'as' => 'clone/model', 'uses' => 'AssetModelsController@getClone' ]);
Route::post('{modelId}/clone', 'AssetModelsController@postCreate');
Route::get('{modelId}/view', [ 'as' => 'view/model', 'uses' => 'AssetModelsController@getView' ]);
Route::get('{modelID}/restore', [ 'as' => 'restore/model', 'uses' => 'AssetModelsController@getRestore', 'middleware' => ['authorize:superuser'] ]);
Route::get('{modelId}/custom_fields', ['as' => 'custom_fields/model','uses' => 'AssetModelsController@getCustomFields']);
});
Route::resource('models', 'AssetModelsController', [
'parameters' => ['model' => 'model_id']
]);