Skip to content

Commit 071b4d1

Browse files
authored
Merge pull request #16245 from marcusmoore/chore/migrate-form-open-pt5
Replace Form::open and Form::close pt5
2 parents 1fe170e + 2df995c commit 071b4d1

File tree

6 files changed

+26
-22
lines changed

6 files changed

+26
-22
lines changed

resources/views/settings/asset_tags.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</style>
2222

2323

24-
{{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
24+
<form method="POST" action="{{ route('settings.asset_tags.save') }}" accept-charset="UTF-8" autocomplete="off" class="form-horizontal" role="form">
2525
<!-- CSRF Token -->
2626
{{csrf_field()}}
2727

@@ -106,6 +106,6 @@
106106
</div> <!-- /.col-md-8-->
107107
</div> <!-- /.row-->
108108

109-
{{Form::close()}}
109+
</form>
110110

111111
@stop

resources/views/settings/backups.blade.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,8 @@ class="btn btn-warning btn-sm restore-backup {{ (config('app.lock_passwords')) ?
158158
@if (config('app.lock_passwords')===true)
159159
<p class="alert alert-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
160160
@else
161-
162-
{{ Form::open([
163-
'method' => 'POST',
164-
'route' => 'settings.backups.upload',
165-
'files' => true,
166-
'class' => 'form-horizontal' ]) }}
161+
162+
<form method="POST" action="{{ route('settings.backups.upload') }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
167163
@csrf
168164

169165

@@ -194,7 +190,7 @@ class="btn btn-warning btn-sm restore-backup {{ (config('app.lock_passwords')) ?
194190

195191
</div>
196192

197-
{{ Form::close() }}
193+
</form>
198194
@endif
199195
</div>
200196
</div>

resources/views/settings/branding.blade.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,17 @@
2121
</style>
2222

2323

24-
{{ Form::open(['method' => 'POST', 'files' => true, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'create-form' ]) }}
24+
<form
25+
method="POST"
26+
action="{{ route('settings.branding.save') }}"
27+
accept-charset="UTF-8"
28+
autocomplete="off"
29+
class="form-horizontal"
30+
role="form"
31+
id="create-form"
32+
enctype="multipart/form-data"
33+
novalidate="novalidate"
34+
>
2535
<!-- CSRF Token -->
2636
{{csrf_field()}}
2737

@@ -340,7 +350,7 @@
340350
</div> <!-- /.col-md-8-->
341351
</div> <!-- /.row-->
342352

343-
{{Form::close()}}
353+
</form>
344354

345355
@stop
346356

resources/views/settings/general.blade.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,17 +366,17 @@
366366
</div>
367367
</div>
368368

369-
369+
370370
<!-- Depreciation method -->
371371
<div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}">
372372
<div class="col-md-3">
373373
<label for="depreciation_method">{{ trans('Depreciation method') }}</label>
374374
</div>
375375
<div class="col-md-9">
376376
{{ Form::select('depreciation_method', array(
377-
'default' => 'Linear (default)',
378-
'half_1' => 'Half-year convention, always applied',
379-
'half_2' => 'Half-year convention, applied with condition',
377+
'default' => 'Linear (default)',
378+
'half_1' => 'Half-year convention, always applied',
379+
'half_2' => 'Half-year convention, applied with condition',
380380
), old('username_format', $setting->depreciation_method), ['class' =>'select2', 'style' => 'width: 80%']) }}
381381
</div>
382382
</div>
@@ -423,7 +423,7 @@
423423
</div> <!-- /.col-md-8-->
424424

425425

426-
{{ Form::close() }}
426+
</form>
427427

428428
@stop
429429

resources/views/settings/google.blade.php

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

1717

1818

19-
{{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
19+
<form method="POST" action="{{ route('settings.google.save') }}" accept-charset="UTF-8" autocomplete="off" class="form-horizontal" role="form">
2020
<!-- CSRF Token -->
2121
{{csrf_field()}}
2222

@@ -121,6 +121,6 @@ class="form-control"
121121
</div> <!-- /.col-md-8-->
122122
</div> <!-- /.row-->
123123

124-
{{Form::close()}}
124+
</form>
125125

126126
@stop

resources/views/settings/labels.blade.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
</style>
2222

23-
{{ Form::open(['id' => 'settingsForm', 'method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
23+
<form method="POST" action="{{ route('settings.labels.save') }}" accept-charset="UTF-8" id="settingsForm" autocomplete="off" class="form-horizontal" role="form">
2424
<!-- CSRF Token -->
2525
{{csrf_field()}}
2626

@@ -348,8 +348,6 @@ class="form-control"
348348
}
349349
</style>
350350

351-
352-
{{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
353351
<!-- CSRF Token -->
354352
{{csrf_field()}}
355353

@@ -520,7 +518,7 @@ class="form-control"
520518
</div> <!-- /.col-md-8-->
521519
</div> <!-- /.row-->
522520

523-
{{Form::close()}}
521+
</form>
524522

525523
@stop
526524

0 commit comments

Comments
 (0)