DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-09-28 22:22:37 -07:00
parent 70a9b7bf05 aab409dec2
commit 8247a73182
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1230,7 +1230,7 @@ class AssetsController extends Controller
foreach ($asset_ids as $asset_id) { foreach ($asset_ids as $asset_id) {
$asset = Asset::find($asset_id); $asset = Asset::find($asset_id);
$this->authorize('checkout', $asset); $this->authorize('checkout', $asset);
$error = $asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null); $error = $asset->checkOut($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null);
if ($error) { if ($error) {
array_merge_recursive($errors, $asset->getErrors()->toArray()); array_merge_recursive($errors, $asset->getErrors()->toArray());

3
resources/views/hardware/bulk-checkout.blade.php
View file

@ -82,13 +82,14 @@
{!! $errors->first('selected_asset', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('selected_asset', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
</div> </div>
</form>
</div> <!--./box-body--> </div> <!--./box-body-->
<div class="box-footer"> <div class="box-footer">
<a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a> <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkout') }}</button> <button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkout') }}</button>
</div> </div>
</div> </div>
</form>
</div> <!--/.col-md-7--> </div> <!--/.col-md-7-->
<!-- right column --> <!-- right column -->

2
resources/views/partials/bootstrap-table.blade.php
View file

@ -139,7 +139,7 @@ $('.snipe-table').bootstrapTable({
// Use this when we're introspecting into a column object and need to link // Use this when we're introspecting into a column object and need to link
function genericColumnObjLinkFormatter(destination) { function genericColumnObjLinkFormatter(destination) {
return function (value,row) { return function (value,row) {
if (value.status_type) { if ((value) && (value.status_type)) {
return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a> ' + '<label class="label label-default">'+ value.status_type + '</label>'; return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a> ' + '<label class="label label-default">'+ value.status_type + '</label>';
} else if ((value) && (value.name)) { } else if ((value) && (value.name)) {
return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a>'; return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a>';