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

Added proper sort

Browse Source
This commit is contained in:
snipe
2015-03-12 22:09:18 -07:00
parent 2cdfeacc1b
commit 662c3f04dd
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+7 -8
View File
@@ -905,11 +905,10 @@ class AssetsController extends AdminController
$actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets)
{
if ($assets->deleted_at=='') {
return '<a href="'.route('update/hardware', $assets->id).'" class="btn btn-warning btn-sm"><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/hardware', $assets->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($assets->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
} else {
if ($asset->model->deleted_at=='') {
return '<a href="'.route('update/hardware', $assets->id).'" class="btn btn-warning btn-sm"><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/hardware', $assets->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($assets->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
} elseif ($asset->model->deleted_at!='') {
return '<a href="'.route('restore/hardware', $assets->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
}
}
});
@@ -930,7 +929,7 @@ class AssetsController extends AdminController
return Datatable::collection($assets)
->addColumn('name',function($assets)
{
return '<a href="hardware/'.$assets->id.'/view">'.$assets->name.'</a>';
return link_to('hardware/'.$assets->id.'/view', $assets->name);
})
->showColumns('asset_tag', 'serial')
@@ -938,7 +937,7 @@ class AssetsController extends AdminController
->addColumn('status',function($assets)
{
if ($assets->assigned_to!='') {
return '<a href="../users/'.$assets->assigned_to.'/view">'.$assets->assigneduser->fullName().'</a> ';
return link_to('../users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
} else {
return $assets->assetstatus->name;
}
@@ -964,8 +963,8 @@ class AssetsController extends AdminController
})
->addColumn($inout)
->addColumn($actions)
->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkedout_on')
->orderColumns('name', 'asset_tag', 'serial')
->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date')
->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date')
->make();
}