Skip to content

Commit 5a4a3aa

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents e1c0a80 + 2220828 commit 5a4a3aa

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

‎app/Http/Controllers/Api/UsersController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ public function index(Request $request) : array
283283
'autoassign_licenses',
284284
'website',
285285
'locale',
286+
'notes',
286287
];
287288

288289
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'first_name';

‎app/Http/Requests/AssetCheckoutRequest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public function rules()
2424
$settings = \App\Models\Setting::getSettings();
2525

2626
$rules = [
27-
'assigned_user' => 'required_without_all:assigned_asset,assigned_location',
28-
'assigned_asset' => 'required_without_all:assigned_user,assigned_location',
29-
'assigned_location' => 'required_without_all:assigned_user,assigned_asset',
27+
'assigned_user' => 'integer|required_without_all:assigned_asset,assigned_location',
28+
'assigned_asset' => 'integer|required_without_all:assigned_user,assigned_location',
29+
'assigned_location' => 'integer|required_without_all:assigned_user,assigned_asset',
3030
'status_id' => 'exists:status_labels,id,deployable,1',
3131
'checkout_to_type' => 'required|in:asset,location,user',
3232
'checkout_at' => [

‎resources/views/models/custom_fields_form.blade.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22
@foreach($model->fieldset->fields AS $field)
33
<div class="form-group{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">
44
<label for="{{ $field->db_column_name() }}" class="col-md-3 control-label">{{ $field->name }} </label>
5-
<div class="col-md-7 col-sm-12{{ ($field->pivot->required=='1') ? ' required' : '' }}">
5+
<div class="col-md-7 col-sm-12">
66

77

88
@if ($field->element!='text')
9-
<!-- Listbox -->
9+
1010
@if ($field->element=='listbox')
11+
<!-- Listbox -->
1112
{{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
12-
old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
13+
old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))), ['class' => 'format select2 form-control', ($field->pivot->required=='1' ? ' required' : '') ]) }}
1314

1415
@elseif ($field->element=='textarea')
15-
<textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
16+
<!-- Textarea -->
17+
<textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}"{{ ($field->pivot->required=='1') ? ' required' : '' }}>{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
1618

1719
@elseif ($field->element=='checkbox')
18-
<!-- Checkboxes -->
20+
<!-- Checkbox -->
1921
@foreach ($field->formatFieldValuesAsArray() as $key => $value)
2022
<div>
2123
<label class="form-control">
@@ -26,35 +28,33 @@
2628
@endforeach
2729

2830
@elseif ($field->element=='radio')
29-
@foreach ($field->formatFieldValuesAsArray() as $value)
30-
31-
<div>
32-
<label class="form-control">
33-
<input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
34-
{{ $value }}
35-
</label>
36-
</div>
37-
@endforeach
38-
31+
<!-- Radio -->
32+
@foreach ($field->formatFieldValuesAsArray() as $value)
33+
<div>
34+
<label class="form-control">
35+
<input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
36+
{{ $value }}
37+
</label>
38+
</div>
39+
@endforeach
3940
@endif
4041

4142

4243
@else
4344
<!-- Date field -->
44-
4545
@if ($field->format=='DATE')
4646

4747
<div class="input-group col-md-5" style="padding-left: 0px;">
4848
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
49-
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" style="background-color:inherit">
49+
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" style="background-color:inherit"{{ ($field->pivot->required=='1') ? ' required' : '' }}>
5050
<span class="input-group-addon"><x-icon type="calendar" /></span>
5151
</div>
5252
</div>
5353

5454

5555
@else
5656
@if (($field->field_encrypted=='0') || (Gate::allows('assets.view.encrypted_custom_fields')))
57-
<input type="text" value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text">
57+
<input type="text" value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text"{{ ($field->pivot->required=='1') ? ' required' : '' }}>
5858
@else
5959
<input type="text" value="{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}" class="form-control disabled" disabled>
6060
@endif

0 commit comments

Comments
 (0)