Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 2d344ae

Browse files
committed
fix validation for pages
add create btn to edit pages v3.0.3
1 parent c60ed62 commit 2d344ae

File tree

10 files changed

+47
-23
lines changed

10 files changed

+47
-23
lines changed

logs/v3.0.1.txt

-3
This file was deleted.

logs/v3.0.3.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- fix page validation
2+
- add create new btn to edit pages

src/Controllers/Admin/Traits/PageOps.php

+19-10
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,38 @@ protected function sT_uP_Validaiton($request, $id = null)
2323
$routename = 'required|unique:pages,route_name,' . $id;
2424
}
2525

26+
$customMessages = [
27+
'template.required_without' => __('validation.required_without', [
28+
'attribute' => __('SimpleMenu::validation.attributes.template'),
29+
'values' => __('SimpleMenu::validation.attributes.action'),
30+
]),
31+
'route_name.required' => __('validation.required', ['attribute' => __('SimpleMenu::validation.attributes.route_name')]),
32+
'url.required' => __('validation.required', ['attribute' => __('SimpleMenu::validation.attributes.url')]),
33+
'title.required' => __('validation.required', ['attribute' => __('SimpleMenu::validation.attributes.title')]),
34+
];
35+
2636
$validator = Validator::make($request->all(), [
27-
'template' => 'required_without:action',
28-
'route_name' => $routename,
29-
]);
37+
'template' => 'required_without:action',
38+
'route_name' => $routename,
39+
], $customMessages);
3040

3141
// because laravel still pretty fucked up when it comes to showing array input errors
32-
$validator->after(function ($validator) use ($request) {
42+
$validator->after(function ($validator) use ($request, $customMessages) {
3343
// url
3444
if (!array_filter($request->url)) {
35-
$validator->errors()->add('url', 'Url is required');
45+
$validator->errors()->add('url', $customMessages['url.required']);
3646
}
3747

3848
// title
3949
if (!array_filter($request->title)) {
40-
$validator->errors()->add('title', 'The Title is required');
50+
$validator->errors()->add('title', $customMessages['title.required']);
4151
}
4252
});
4353

4454
if ($validator->fails()) {
45-
throw new ValidationException($validator, $this->buildFailedValidationResponse(
46-
$request,
47-
$this->formatValidationErrors($validator)
48-
));
55+
throw (new ValidationException($validator))
56+
->errorBag('default')
57+
->redirectTo(url()->previous());
4958
}
5059
}
5160

src/resources/lang/en/validation.php

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
return [
4+
'attributes' => [
5+
'title' => 'Title',
6+
'url' => 'Url',
7+
'template' => 'Template',
8+
'action' => 'Action',
9+
'route_name' => 'Route Name',
10+
],
11+
];

src/resources/views/admin/bulma/menus/create.blade.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<div class="field has-addons">
1616
<div class="control is-expanded">
1717
{{ Form::text('name', null, ['class' => 'input', 'placeholder'=>'name']) }}
18+
@if($errors->has('name'))
19+
<p class="help is-danger">
20+
{{ $errors->first('name') }}
21+
</p>
22+
@endif
1823
</div>
19-
@if($errors->has('name'))
20-
<p class="help is-danger">
21-
{{ $errors->first('name') }}
22-
</p>
23-
@endif
2424
<div class="control">
2525
{{ Form::submit(trans('SimpleMenu::messages.app_save'), ['class' => 'button is-success']) }}
2626
</div>

src/resources/views/admin/bulma/menus/edit.blade.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@section('sub')
55
<h3 class="title">
66
<a href="{{ url()->previous() }}">Go Back</a>
7+
<a href="{{ route($crud_prefix.'.menus.create') }}" class="button is-success">@lang('SimpleMenu::messages.app_add_new')</a>
78
</h3>
89

910
<menu-comp inline-template
@@ -21,12 +22,12 @@
2122
<div class="field has-addons">
2223
<div class="control is-expanded">
2324
{{ Form::text('name', $menu->name, ['class' => 'input']) }}
25+
@if($errors->has('name'))
26+
<p class="help is-danger">
27+
{{ $errors->first('name') }}
28+
</p>
29+
@endif
2430
</div>
25-
@if($errors->has('name'))
26-
<p class="help is-danger">
27-
{{ $errors->first('name') }}
28-
</p>
29-
@endif
3031
<div class="control">
3132
{{ Form::submit(trans('SimpleMenu::messages.app_update'), ['class' => 'button is-warning']) }}
3233
</div>

src/resources/views/admin/bulma/pages/edit.blade.php

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
@section('sub')
1010
<h3 class="title">
1111
<a href="{{ url()->previous() }}">Go Back</a>
12+
<a href="{{ route($crud_prefix.'.pages.create') }}" class="button is-success">@lang('SimpleMenu::messages.app_add_new')</a>
1213
</h3>
1314
<hr>
1415

src/resources/views/admin/bulma/permissions/edit.blade.php

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@section('sub')
55
<h3 class="title">
66
<a href="{{ url()->previous() }}">Go Back</a>
7+
<a href="{{ route($crud_prefix.'.permissions.create') }}" class="button is-success">@lang('SimpleMenu::messages.app_add_new')</a>
78
</h3>
89

910
{{ Form::model($permission, ['method' => 'PUT', 'route' => [$crud_prefix.'.permissions.update', $permission->id]]) }}

src/resources/views/admin/bulma/roles/edit.blade.php

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@section('sub')
55
<h3 class="title">
66
<a href="{{ url()->previous() }}">Go Back</a>
7+
<a href="{{ route($crud_prefix.'.roles.create') }}" class="button is-success">@lang('SimpleMenu::messages.app_add_new')</a>
78
</h3>
89

910
{{ Form::model($role, ['method' => 'PUT', 'route' => [$crud_prefix.'.roles.update', $role->id]]) }}

src/resources/views/admin/bulma/users/edit.blade.php

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@section('sub')
55
<h3 class="title">
66
<a href="{{ url()->previous() }}">Go Back</a>
7+
<a href="{{ route($crud_prefix.'.users.create') }}" class="button is-success">@lang('SimpleMenu::messages.app_add_new')</a>
78
</h3>
89
<hr>
910

0 commit comments

Comments
 (0)