lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Added #6617: View licenses checked out to an asset with the hardware API (#6621)

Browse source
This commit is contained in:
bricelabelle 2019-01-22 16:47:40 -06:00 • committed by snipe
parent 7982b3f237
commit 5281713fd9
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/Api/AssetsController.php
View file

@ -5,10 +5,12 @@ use App\Helpers\Helper;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\AssetCheckoutRequest; use App\Http\Requests\AssetCheckoutRequest;
use App\Http\Transformers\AssetsTransformer; use App\Http\Transformers\AssetsTransformer;
use App\Http\Transformers\LicensesTransformer;
use App\Models\Asset; use App\Models\Asset;
use App\Models\AssetModel; use App\Models\AssetModel;
use App\Models\Company; use App\Models\Company;
use App\Models\CustomField; use App\Models\CustomField;
use App\Models\License;
use App\Models\Location; use App\Models\Location;
use App\Models\Setting; use App\Models\Setting;
use App\Models\User; use App\Models\User;
@ -332,7 +334,14 @@ class AssetsController extends Controller
} }
public function licenses($id)
{
$this->authorize('view', Asset::class);
$this->authorize('view', License::class);
$asset = Asset::where('id', $id)->withTrashed()->first();
$licenses = $asset->licenses()->get();
return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
}
/** /**
* Gets a paginated collection for the select2 menus * Gets a paginated collection for the select2 menus

5
routes/api.php
View file

@ -305,6 +305,11 @@ Route::group(['prefix' => 'v1','namespace' => 'Api'], function () {
Route::group(['prefix' => 'hardware'], function () { Route::group(['prefix' => 'hardware'], function () {
Route::get('{asset_id}/licenses', [
'as' => 'api.assets.licenselist',
'uses' => 'AssetsController@licenses'
]);
Route::get( 'bytag/{tag}', [ Route::get( 'bytag/{tag}', [
'as' => 'assets.show.bytag', 'as' => 'assets.show.bytag',
'uses' => 'AssetsController@showByTag' 'uses' => 'AssetsController@showByTag'