DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-05 19:07:30 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-18 07:16:19 -07:00
parent 97f65ceac0 68f6385eba
commit 38dd03b5ad
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1179,6 +1179,9 @@ class AssetsController extends Controller
$user = User::find(e(Input::get('assigned_to'))); $user = User::find(e(Input::get('assigned_to')));
$admin = Auth::user(); $admin = Auth::user();
if (!is_array(Input::get('selected_assets'))) {
return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
}
$asset_ids = array_filter(Input::get('selected_assets')); $asset_ids = array_filter(Input::get('selected_assets'));
if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) { if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) {

3
resources/lang/en/admin/hardware/message.php
View file

@ -62,7 +62,8 @@ return array(
'error' => 'Asset was not checked out, please try again', 'error' => 'Asset was not checked out, please try again',
'success' => 'Asset checked out successfully.', 'success' => 'Asset checked out successfully.',
'user_does_not_exist' => 'That user is invalid. Please try again.', 'user_does_not_exist' => 'That user is invalid. Please try again.',
'not_available' => 'That asset is not available for checkout!' 'not_available' => 'That asset is not available for checkout!',
'no_assets_selected' => 'You must select at least one asset from the list'
), ),
'checkin' => array( 'checkin' => array(

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

@ -76,7 +76,7 @@
@endif @endif
</td> </td>
<td> <td>
@if ($licensedto->asset_id) @if ($licensedto->asset)
@can('view', $licensedto->asset) @can('view', $licensedto->asset)
<a href="{{ route('hardware.show', $licensedto->asset_id) }}"> <a href="{{ route('hardware.show', $licensedto->asset_id) }}">
{{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }} {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }}