mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-21 00:07:42 -07:00
296de34e8a
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials
70 lines
2.8 KiB
PHP
Executable file
70 lines
2.8 KiB
PHP
Executable file
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
{{ trans('admin/licenses/general.checkin') }}
|
|
@parent
|
|
@stop
|
|
|
|
|
|
@section('header_right')
|
|
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
|
|
{{ trans('general.back') }}</a>
|
|
@stop
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
<div class="row">
|
|
<!-- left column -->
|
|
<div class="col-md-7">
|
|
<form class="form-horizontal" method="post" action="{{ route('licenses.checkin.save', ['licenseId'=>$licenseSeat->id, 'backTo'=>$backto] ) }}" autocomplete="off">
|
|
{{csrf_field()}}
|
|
|
|
<div class="box box-default">
|
|
<div class="box-header with-border">
|
|
<h3 class="box-title"> {{ $licenseSeat->license->name }}</h3>
|
|
</div>
|
|
<div class="box-body">
|
|
|
|
<!-- license name -->
|
|
<div class="form-group">
|
|
<label class="col-sm-2 control-label">{{ trans('admin/hardware/form.name') }}</label>
|
|
<div class="col-md-6">
|
|
<p class="form-control-static">{{ $licenseSeat->license->name }}</p>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Serial -->
|
|
<div class="form-group">
|
|
<label class="col-sm-2 control-label">{{ trans('admin/hardware/form.serial') }}</label>
|
|
<div class="col-md-6">
|
|
<p class="form-control-static">
|
|
@can('viewKeys', $licenseSeat->license)
|
|
{{ $licenseSeat->license->serial }}
|
|
@else
|
|
------------
|
|
@endcan
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Note -->
|
|
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
|
|
<label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
|
|
<div class="col-md-7">
|
|
<textarea class="col-md-6 form-control" id="note" name="note">{{ Request::old('note', $licenseSeat->note) }}</textarea>
|
|
{!! $errors->first('note', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
</div>
|
|
<div class="box-footer">
|
|
<a class="btn btn-link" href="{{ route('licenses.index') }}">{{ trans('button.cancel') }}</a>
|
|
<button type="submit" class="btn btn-success pull-right"><i class="fa fa-check icon-white"></i> {{ trans('general.checkin') }}</button>
|
|
</div>
|
|
</div> <!-- /.box-->
|
|
</form>
|
|
</div> <!-- /.col-md-7-->
|
|
</div>
|
|
|
|
|
|
@stop
|