Skip to content

Commit 29311b1

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 6cc2013 + b131227 commit 29311b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+203
-147
lines changed

‎app/Http/Controllers/Assets/AssetsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ public function getQrCode($assetId = null) : Response | BinaryFileResponse | str
535535
{
536536
$settings = Setting::getSettings();
537537

538-
if ($settings->qr_code == '1') {
538+
if (($settings->qr_code === '1') && ($settings->label2_2d_type !== 'none')) {
539539
$asset = Asset::withTrashed()->find($assetId);
540540
if ($asset) {
541541
$size = Helper::barcodeDimensions($settings->label2_2d_type);

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"less-loader": "^6.0",
5252
"list.js": "^1.5.0",
5353
"morris.js": "github:morrisjs/morris.js",
54-
"papaparse": "5.4.1",
54+
"papaparse": "5.5.1",
5555
"select2": "4.0.13",
5656
"sheetjs": "^2.0.0",
5757
"signature_pad": "^4.2.0",

‎resources/views/groups/edit.blade.php‎

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
5757
<label for="name" class="col-md-3 control-label">{{ trans('admin/groups/titles.group_name') }}</label>
5858
<div class="col-md-6 required">
59-
<input class="form-control" type="text" name="name" id="name" value="{{ old('name', $group->name) }}" />
59+
<input class="form-control" type="text" name="name" id="name" value="{{ old('name', $group->name) }}" required />
6060
{!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
6161
</div>
6262
</div>
@@ -88,11 +88,23 @@
8888
</td>
8989
<td class="col-md-1 permissions-item">
9090
<label for="{{ 'permission['.$localPermission['permission'].']' }}" style="form-control"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
91-
{{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
91+
<input
92+
value="1"
93+
aria-label="permission[{{ $localPermission['permission'] }}]"
94+
@checked(array_key_exists($localPermission['permission'], $groupPermissions) && $groupPermissions[$localPermission['permission']] == '1')
95+
name="permission[{{ $localPermission['permission'] }}]"
96+
type="radio"
97+
>
9298
</td>
9399
<td class="col-md-1 permissions-item">
94100
<label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
95-
{{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
101+
<input
102+
value="0"
103+
aria-label="permission[{{ $localPermission['permission'] }}]"
104+
@checked(array_key_exists($localPermission['permission'], $groupPermissions) && $groupPermissions[$localPermission['permission']] == '0')
105+
name="permission[{{ $localPermission['permission'] }}]"
106+
type="radio"
107+
>
96108
</td>
97109
</tr>
98110
</tbody>
@@ -109,11 +121,23 @@
109121
</td>
110122
<td class="col-md-1 permissions-item" style="vertical-align: bottom">
111123
<label for="{{ $area }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ $area }}</span></label>
112-
{{ Form::radio("$area", '1',false,['value'=>"grant", 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
124+
<input
125+
value="1"
126+
data-checker-group="{{ str_slug($area) }}"
127+
aria-label="{{ $area }}"
128+
name="{{ $area }}"
129+
type="radio"
130+
>
113131
</td>
114132
<td class="col-md-1 permissions-item">
115133
<label for="{{ $area }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ $area }}</span></label>
116-
{{ Form::radio("$area", '0',false,['value'=>"deny", 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
134+
<input
135+
value="0"
136+
data-checker-group="{{ str_slug($area) }}"
137+
aria-label="{{ $area }}"
138+
name="{{ $area }}"
139+
type="radio"
140+
>
117141
</td>
118142
</tr>
119143

@@ -129,11 +153,25 @@ class="col-md-5 tooltip-base permissions-item"
129153
</td>
130154
<td class="col-md-1 permissions-item">
131155
<label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$this_permission['permission'].']' }}</span></label>
132-
{{ Form::radio('permission['.$this_permission['permission'].']', '1',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '1' : null),['class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
156+
<input
157+
class="radiochecker-{{ str_slug($area) }}"
158+
aria-label="permission[{{ $this_permission['permission'] }}]"
159+
@checked(array_key_exists($this_permission['permission'], $groupPermissions) && $groupPermissions[$this_permission['permission']] == '1')
160+
name="permission[{{ $this_permission['permission'] }}]"
161+
type="radio"
162+
value="1"
163+
>
133164
</td>
134165
<td class="col-md-1 permissions-item">
135166
<label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$this_permission['permission'].']' }}</span></label>
136-
{{ Form::radio('permission['.$this_permission['permission'].']', '0',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null),['class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
167+
<input
168+
class="radiochecker-{{ str_slug($area) }}"
169+
aria-label="permission[{{ $this_permission['permission'] }}]"
170+
@checked(array_key_exists($this_permission['permission'], $groupPermissions) && $groupPermissions[$this_permission['permission']] == '0')
171+
name="permission[{{ $this_permission['permission'] }}]"
172+
type="radio"
173+
value="0"
174+
>
137175
</td>
138176

139177
</tr>

‎resources/views/hardware/bulk.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@
140140
<div class="form-group">
141141
<div class="col-md-9 col-md-offset-3">
142142
<label class="form-control">
143-
{{ Form::radio('update_real_loc', '1', old('update_real_loc'), ['checked'=> 'checked', 'aria-label'=>'update_real_loc']) }}
143+
<input type="radio" name="update_real_loc" value="1" checked aria-label="update_real_loc">
144144
{{ trans('admin/hardware/form.asset_location_update_default_current') }}
145145
</label>
146146
<label class="form-control">
147-
{{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
147+
<input type="radio" name="update_real_loc" value="0" aria-label="update_default_loc">
148148
{{ trans('admin/hardware/form.asset_location_update_default') }}
149149
</label>
150150
<label class="form-control">
151-
{{ Form::radio('update_real_loc', '2', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
151+
<input type="radio" name="update_real_loc" value="2" aria-label="update_default_loc">
152152
{{ trans('admin/hardware/form.asset_location_update_actual') }}
153153
</label>
154154

‎resources/views/hardware/quickscan-checkin.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<!-- Asset Tag -->
3333
<div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
34-
{{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'checkin_tag')) }}
34+
<label for="asset_tag" class="col-md-3 control-label" id="checkin_tag">{{ trans('general.asset_tag') }}</label>
3535
<div class="col-md-9">
3636
<div class="input-group col-md-11 required">
3737
<input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ old('asset_tag') }}" required>
@@ -57,7 +57,7 @@
5757

5858
<!-- Note -->
5959
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
60-
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
60+
<label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
6161
<div class="col-md-8">
6262
<textarea class="col-md-6 form-control" id="note" name="note">{{ old('note') }}</textarea>
6363
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

‎resources/views/hardware/quickscan.blade.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
</style>
1818

19-
19+
2020

2121
<div class="row">
2222
{{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'audit-form' ]) }}
@@ -29,7 +29,7 @@
2929

3030
<!-- Next Audit -->
3131
<div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
32-
{{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'audit_tag')) }}
32+
<label for="asset_tag" class="col-md-3 control-label" id="audit_tag">{{ trans('general.asset_tag') }}</label>
3333
<div class="col-md-9">
3434
<div class="input-group date col-md-11 required" data-date-format="yyyy-mm-dd">
3535
<input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ old('asset_tag') }}">
@@ -60,7 +60,7 @@
6060

6161
<!-- Next Audit -->
6262
<div class="form-group {{ $errors->has('next_audit_date') ? 'error' : '' }}">
63-
{{ Form::label('next_audit_date', trans('general.next_audit_date'), array('class' => 'col-md-3 control-label')) }}
63+
<label for="next_audit_date" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
6464
<div class="col-md-9">
6565
<div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-clear-btn="true">
6666
<input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $next_audit_date) }}">
@@ -73,7 +73,7 @@
7373

7474
<!-- Note -->
7575
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
76-
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
76+
<label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
7777
<div class="col-md-8">
7878
<textarea class="col-md-6 form-control" id="note" name="note">{{ old('note') }}</textarea>
7979
{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -101,7 +101,7 @@
101101
<h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> {{ trans('general.assets_audited') }}) </h2>
102102
</div>
103103
<div class="box-body">
104-
104+
105105
<table id="audited" class="table table-striped snipe-table">
106106
<thead>
107107
<tr>
@@ -158,7 +158,7 @@
158158
var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3');
159159
audio.play()
160160
@endif
161-
161+
162162
incrementOnSuccess();
163163
} else {
164164
handleAuditFail(data);

‎resources/views/livewire/slack-settings-form.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<!--Webhook endpoint-->
8484
<div class="form-group{{ $errors->has('webhook_endpoint') ? ' error' : '' }}">
8585
<div class="col-md-2">
86-
{{ Form::label('webhook_endpoint', trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ])) }}
86+
<label for="webhook_endpoint">{{ trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ]) }}</label>
8787
</div>
8888
<div class="col-md-9 required">
8989
<input type="text" wire:model.blur="webhook_endpoint" class="form-control" placeholder="{{$webhook_placeholder}}" value="{{old('webhook_endpoint', $webhook_endpoint)}}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
@@ -100,7 +100,7 @@
100100
@if($webhook_selected != 'microsoft' && $webhook_selected!= 'google')
101101
<div class="form-group{{ $errors->has('webhook_channel') ? ' error' : '' }}">
102102
<div class="col-md-2">
103-
{{ Form::label('webhook_channel', trans('admin/settings/general.webhook_channel',['app' => $webhook_name ])) }}
103+
<label for="webhook_channel">{{ trans('admin/settings/general.webhook_channel',['app' => $webhook_name ]) }}</label>
104104
</div>
105105
<div class="col-md-9 required">
106106
<input type="text" wire:model.blur="webhook_channel" class="form-control" placeholder="#IT-Ops" value="{{ old('webhook_channel', $webhook_channel) }}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
@@ -118,7 +118,7 @@
118118
@if($webhook_selected != 'microsoft' && $webhook_selected != 'google')
119119
<div class="form-group{{ $errors->has('webhook_botname') ? ' error' : '' }}">
120120
<div class="col-md-2">
121-
{{ Form::label('webhook_botname', trans('admin/settings/general.webhook_botname',['app' => $webhook_name ])) }}
121+
<label for="webhook_botname">{{ trans('admin/settings/general.webhook_botname',['app' => $webhook_name ]) }}</label>
122122
</div>
123123
<div class="col-md-9">
124124
<input type="text" wire:model.blur="webhook_botname" class='form-control' placeholder="Snipe-Bot" {{ old('webhook_botname', $webhook_botname)}}{{ Helper::isDemoMode() ? ' disabled' : ''}}>

‎resources/views/locations/print.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126

127127
@foreach ($assets as $asset)
128128
@php
129-
if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus->archived == 1){
129+
if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus?->archived == 1){
130130
continue;
131131
}
132132
@endphp

‎resources/views/models/bulk-edit.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@
8484
<div class="col-md-7 col-md-offset-3">
8585

8686
<label for="requestable_nochange" class="form-control">
87-
{{ Form::radio('requestable', '', true, ['id' => 'requestable_nochange', 'aria-label'=>'requestable_nochange']) }}
87+
<input type="radio" name="requestable" id="requestable_nochange" value="" aria-label="requestable_nochange" checked>
8888
{{ trans('admin/hardware/general.requestable_status_warning')}}
8989
</label>
9090
<label for="requestable" class="form-control">
91-
{{ Form::radio('requestable', '1', old('requestable'), ['id' => 'requestable', 'aria-label'=>'requestable']) }}
91+
<input type="radio" name="requestable" id="requestable" value="1" aria-label="requestable">
9292
{{ trans('admin/hardware/general.requestable')}}
9393
</label>
9494
<label for="not_requestable" class="form-control">
95-
{{ Form::radio('requestable', '0', old('requestable'), ['id' => 'not_requestable','aria-label'=>'not_requestable']) }}
95+
<input type="radio" name="requestable" id="not_requestable" value="0" aria-label="not_requestable">
9696
{{ trans('admin/hardware/general.not_requestable')}}
9797
</label>
9898

0 commit comments

Comments
 (0)