Skip to content

Commit fd60ce1

Browse files
snipesnipe
authored
Merge pull request grokability#16140 from marcusmoore/chore/sc-28233
2 parents e53ed23 + 00cdb13 commit fd60ce1

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎resources/views/settings/backups.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</a>
1313

1414
<form method="POST" style="display: inline">
15-
{{ Form::hidden('_token', csrf_token()) }}
15+
@csrf
1616
<button class="btn btn-primary {{ (config('app.lock_passwords')) ? ' disabled': '' }}">{{ trans('admin/settings/general.generate_backup') }}</button>
1717
</form>
1818

‎resources/views/settings/labels.blade.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -308,31 +308,31 @@ class="table table-striped snipe-table"
308308
@else
309309

310310
<!-- Hidden version of new settings -->
311-
{{ Form::hidden('label2_template', old('label2_template', $setting->label2_template)) }}
312-
{{ Form::hidden('label2_title', old('label2_title', $setting->label2_title)) }}
313-
{{ Form::hidden('label2_asset_logo', old('label2_asset_logo', $setting->label2_asset_logo)) }}
314-
{{ Form::hidden('label2_fields', old('label2_fields', $setting->label2_fields)) }}
311+
<input name="label2_template" type="hidden" value="{{ old('label2_template', $setting->label2_template) }}" />
312+
<input name="label2_title" type="hidden" value="{{ old('label2_title', $setting->label2_title) }}" />
313+
<input name="label2_asset_logo" type="hidden" value="{{ old('label2_asset_logo', $setting->label2_asset_logo) }}" />
314+
<input name="label2_fields" type="hidden" value="{{ old('label2_fields', $setting->label2_fields) }}" />
315315
@endif
316316

317317
@if ($setting->label2_enable && ($setting->label2_template != 'DefaultLabel'))
318318
<!-- Hidden version of legacy settings -->
319-
{{ Form::hidden('labels_per_page', old('labels_per_page', $setting->labels_per_page)) }}
320-
{{ Form::hidden('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize)) }}
321-
{{ Form::hidden('labels_width', old('labels_width', $setting->labels_width)) }}
322-
{{ Form::hidden('labels_height', old('labels_height', $setting->labels_height)) }}
323-
{{ Form::hidden('labels_display_sgutter', old('labels_display_sgutter', $setting->labels_display_sgutter)) }}
324-
{{ Form::hidden('labels_display_bgutter', old('labels_display_bgutter', $setting->labels_display_bgutter)) }}
325-
{{ Form::hidden('labels_pmargin_top', old('labels_pmargin_top', $setting->labels_pmargin_top)) }}
326-
{{ Form::hidden('labels_pmargin_bottom', old('labels_pmargin_bottom', $setting->labels_pmargin_bottom)) }}
327-
{{ Form::hidden('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left)) }}
328-
{{ Form::hidden('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right)) }}
329-
{{ Form::hidden('labels_pagewidth', old('labels_pagewidth', $setting->labels_pagewidth)) }}
330-
{{ Form::hidden('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight)) }}
331-
{{ Form::hidden('labels_display_name', old('labels_display_name', $setting->labels_display_name)) }}
332-
{{ Form::hidden('labels_display_serial', old('labels_display_serial', $setting->labels_display_serial)) }}
333-
{{ Form::hidden('labels_display_tag', old('labels_display_tag', $setting->labels_display_tag)) }}
334-
{{ Form::hidden('labels_display_model', old('labels_display_model', $setting->labels_display_model)) }}
335-
{{ Form::hidden('labels_display_company_name', old('labels_display_company_name', $setting->labels_display_company_name)) }}
319+
<input name="labels_per_page" type="hidden" value="{{ old('labels_per_page', $setting->labels_per_page) }}" />
320+
<input name="labels_fontsize" type="hidden" value="{{ old('labels_fontsize', $setting->labels_fontsize) }}" />
321+
<input name="labels_width" type="hidden" value="{{ old('labels_width', $setting->labels_width) }}" />
322+
<input name="labels_height" type="hidden" value="{{ old('labels_height', $setting->labels_height) }}" />
323+
<input name="labels_display_sgutter" type="hidden" value="{{ old('labels_display_sgutter', $setting->labels_display_sgutter) }}" />
324+
<input name="labels_display_bgutter" type="hidden" value="{{ old('labels_display_bgutter', $setting->labels_display_bgutter) }}" />
325+
<input name="labels_pmargin_top" type="hidden" value="{{ old('labels_pmargin_top', $setting->labels_pmargin_top) }}" />
326+
<input name="labels_pmargin_bottom" type="hidden" value="{{ old('labels_pmargin_bottom', $setting->labels_pmargin_bottom) }}" />
327+
<input name="labels_pmargin_left" type="hidden" value="{{ old('labels_pmargin_left', $setting->labels_pmargin_left) }}" />
328+
<input name="labels_pmargin_right" type="hidden" value="{{ old('labels_pmargin_right', $setting->labels_pmargin_right) }}" />
329+
<input name="labels_pagewidth" type="hidden" value="{{ old('labels_pagewidth', $setting->labels_pagewidth) }}" />
330+
<input name="labels_pageheight" type="hidden" value="{{ old('labels_pageheight', $setting->labels_pageheight) }}" />
331+
<input name="labels_display_name" type="hidden" value="{{ old('labels_display_name', $setting->labels_display_name) }}" />
332+
<input name="labels_display_serial" type="hidden" value="{{ old('labels_display_serial', $setting->labels_display_serial) }}" />
333+
<input name="labels_display_tag" type="hidden" value="{{ old('labels_display_tag', $setting->labels_display_tag) }}" />
334+
<input name="labels_display_model" type="hidden" value="{{ old('labels_display_model', $setting->labels_display_model) }}" />
335+
<input name="labels_display_company_name" type="hidden" value="{{ old('labels_display_company_name', $setting->labels_display_company_name) }}" />
336336
@else
337337
<!-- Legacy settings -->
338338
<style>

0 commit comments

Comments
 (0)