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

Commit 334ecfb

Browse files
committed
remove attributes key from validation
1 parent 56e25cf commit 334ecfb

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

src/Controllers/Admin/Traits/PageOps.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,19 @@ protected function sT_uP_Validaiton($request, $id = null)
2525

2626
$customMessages = [
2727
'template.required_without' => __('validation.required_without', [
28-
'attribute' => __('SimpleMenu::validation.attributes.template'),
29-
'values' => __('SimpleMenu::validation.attributes.action'),
28+
'attribute' => __('SimpleMenu::validation.template'),
29+
'values' => __('SimpleMenu::validation.action'),
3030
]),
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-
];
31+
'route_name.required' => __('validation.required', ['attribute' => __('SimpleMenu::validation.route_name')]),
32+
'url.required' => __('validation.required', ['attribute' => __('SimpleMenu::validation.url')]),
33+
'title.required' => __('validation.required', ['attribute' => __('SimpleMenu::validation.title')]),
34+
];
3535

3636
$validator = Validator::make($request->all(), [
3737
'template' => 'required_without:action',
3838
'route_name' => $routename,
3939
], $customMessages);
4040

41-
// because laravel still pretty fucked up when it comes to showing array input errors
4241
$validator->after(function ($validator) use ($request, $customMessages) {
4342
// url
4443
if (!array_filter($request->url)) {
@@ -69,8 +68,8 @@ protected function cleanEmptyTranslations($request)
6968
{
7069
$result = $request->except(['roles', 'permissions', 'menus']);
7170

72-
foreach ($result as $k =>$v) {
73-
if ($v == null) {
71+
foreach ($result as $k => $v) {
72+
if (null == $v) {
7473
unset($result[$k]);
7574
}
7675
if (is_array($v)) {

src/resources/lang/en/validation.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?php
22

33
return [
4-
'attributes' => [
5-
'title' => 'Title',
6-
'url' => 'Url',
7-
'template' => 'Template',
8-
'action' => 'Action',
9-
'route_name' => 'Route Name',
10-
],
4+
'title' => 'Title',
5+
'url' => 'Url',
6+
'template' => 'Template',
7+
'action' => 'Action',
8+
'route_name' => 'Route Name',
119
];

0 commit comments

Comments
 (0)