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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2021-07-08 16:05:32 -07:00
commit f264cade7d
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/ComponentsController.php
View file

@ -210,7 +210,7 @@ class ComponentsController extends Controller
$component->assets()->attach($component->id, [ $component->assets()->attach($component->id, [
'component_id' => $component->id, 'component_id' => $component->id,
'created_at' => \Carbon::now(), 'created_at' => \Carbon::now(),
'assigned_qty' => $request->get('assigned_qty'), 'assigned_qty' => $request->get('assigned_qty', 1),
'user_id' => \Auth::id(), 'user_id' => \Auth::id(),
'asset_id' => $request->get('assigned_to') 'asset_id' => $request->get('assigned_to')
]); ]);

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

@ -991,7 +991,8 @@
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}' }'
data-url="{{ route('api.maintenances.index', array('asset_id' => $asset->id)) }}" data-url="{{ route('api.maintenances.index', array('asset_id' => $asset->id)) }}"
data-cookie-id-table="assetMaintenancesTable"> data-cookie-id-table="assetMaintenancesTable"
data-cookie="true">
</table> </table>
</div> <!-- /.col-md-12 --> </div> <!-- /.col-md-12 -->
</div> <!-- /.row --> </div> <!-- /.row -->
@ -1019,7 +1020,8 @@
}' }'
data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}" data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
data-cookie-id-table="assetHistory"> data-cookie-id-table="assetHistory"
data-cookie="true">
<thead> <thead>
<tr> <tr>
<th data-visible="true" style="width: 40px;" class="hidden-xs">Icon</th> <th data-visible="true" style="width: 40px;" class="hidden-xs">Icon</th>

33
routes/api.php
View file

@ -197,21 +197,6 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api']
/*--- Components API ---*/ /*--- Components API ---*/
Route::resource('components', 'ComponentsController',
[
'names' =>
[
'index' => 'api.components.index',
'show' => 'api.components.show',
'store' => 'api.components.store',
'update' => 'api.components.update',
'destroy' => 'api.components.destroy'
],
'except' => ['create', 'edit'],
'parameters' => ['component' => 'component_id']
]
); // Components resource
Route::group(['prefix' => 'components'], function () { Route::group(['prefix' => 'components'], function () {
Route::get('{component}/assets', Route::get('{component}/assets',
@ -236,6 +221,24 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api']
); );
}); // Components group }); // Components group
Route::resource('components', 'ComponentsController',
[
'names' =>
[
'index' => 'api.components.index',
'show' => 'api.components.show',
'store' => 'api.components.store',
'update' => 'api.components.update',
'destroy' => 'api.components.destroy'
],
'except' => ['create', 'edit'],
'parameters' => ['component' => 'component_id']
]
); // Components resource
/*--- Consumables API ---*/ /*--- Consumables API ---*/