mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-05 19:07:30 -08:00
more test work
This commit is contained in:
parent
5e74b109d9
commit
515f59fed9
|
@ -21,9 +21,9 @@ class AssetCheckinRequest extends Request
|
||||||
*/
|
*/
|
||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
'note' => 'required|in:asset,',
|
||||||
|
|
||||||
];
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function response(array $errors)
|
public function response(array $errors)
|
||||||
|
|
|
@ -27,6 +27,7 @@ class AssetCheckoutRequest extends Request
|
||||||
'assigned_location' => 'required_without_all:assigned_user,assigned_asset',
|
'assigned_location' => 'required_without_all:assigned_user,assigned_asset',
|
||||||
'status_id' => 'exists:status_labels,id,deployable,1',
|
'status_id' => 'exists:status_labels,id,deployable,1',
|
||||||
'checkout_to_type' => 'required|in:asset,location,user',
|
'checkout_to_type' => 'required|in:asset,location,user',
|
||||||
|
'note' => 'required|in:asset,',
|
||||||
'checkout_at' => [
|
'checkout_at' => [
|
||||||
'nullable',
|
'nullable',
|
||||||
'date',
|
'date',
|
||||||
|
|
|
@ -124,13 +124,6 @@
|
||||||
name="note">{{ old('note', $asset->note) }}</textarea>
|
name="note">{{ old('note', $asset->note) }}</textarea>
|
||||||
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
||||||
</div>
|
</div>
|
||||||
@else
|
|
||||||
<div class="col-md-8">
|
|
||||||
<textarea class="col-md-6 form-control" id="note"
|
|
||||||
name="note">{{ old('note', $asset->note) }}</textarea>
|
|
||||||
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
</div>
|
</div>
|
||||||
</div> <!--/.box-body-->
|
</div> <!--/.box-body-->
|
||||||
</div> <!--/.box-body-->
|
</div> <!--/.box-body-->
|
||||||
|
|
Loading…
Reference in a new issue