@@ -25,20 +25,19 @@ protected function sT_uP_Validaiton($request, $id = null)
25
25
26
26
$ customMessages = [
27
27
'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 ' ),
30
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
- ];
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
+ ];
35
35
36
36
$ validator = Validator::make ($ request ->all (), [
37
37
'template ' => 'required_without:action ' ,
38
38
'route_name ' => $ routename ,
39
39
], $ customMessages );
40
40
41
- // because laravel still pretty fucked up when it comes to showing array input errors
42
41
$ validator ->after (function ($ validator ) use ($ request , $ customMessages ) {
43
42
// url
44
43
if (!array_filter ($ request ->url )) {
@@ -69,8 +68,8 @@ protected function cleanEmptyTranslations($request)
69
68
{
70
69
$ result = $ request ->except (['roles ' , 'permissions ' , 'menus ' ]);
71
70
72
- foreach ($ result as $ k =>$ v ) {
73
- if ($ v == null ) {
71
+ foreach ($ result as $ k => $ v ) {
72
+ if (null == $ v ) {
74
73
unset($ result [$ k ]);
75
74
}
76
75
if (is_array ($ v )) {
0 commit comments