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

Commit 4cefa6a

Browse files
jsvalidation added
1 parent 8021730 commit 4cefa6a

34 files changed

+4882
-47
lines changed

app/Http/Controllers/Backend/Admin/RolesController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use App\Http\Controllers\Controller;
88
use Yajra\DataTables\DataTables;
99
use App\Models\{Role, Permission};
10+
use App\Http\Requests\{StoreRole, UpdateRole};
1011

1112
class RolesController extends Controller
1213
{
@@ -102,7 +103,7 @@ public function update(UpdateRole $request, Role $role)
102103
'name' => $request->name
103104
]);
104105
if($updated) {
105-
$updated->syncPermissions($request->permissions);
106+
$role->syncPermissions($request->permissions);
106107
return redirect(config('app.prefix_admin_url') . '/admin/roles?guard=' . $request->guard)->with('success', 'Successfully Updated.');
107108
}
108109
return back()->withErrors(['error' => 'Role Update Failed !'])->withInput();

app/Http/Requests/StoreAdminUser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
'name' => 'required',
27+
'name' => 'required|string|max:160|unique:admin_users',
2828
'email' => 'required|unique:admin_users',
2929
'password' => 'required|min:8'
3030
];

app/Http/Requests/StoreClientUser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
'name' => 'required',
27+
'name' => 'required|string|max:160',
2828
'email' => 'required|unique:users',
2929
'password' => 'required|min:8'
3030
];

app/Http/Requests/StoreRole.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
'name' => 'required|unique:roles'
27+
'name' => 'required|string|max:160|unique:roles'
2828
];
2929
}
3030
}

app/Http/Requests/UpdateAdminUser.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
//
27+
'name' => 'required|string|max:160|unique:admin_users,name,' . $this->route('admin_user')->id,
28+
'email' => 'required|unique:admin_users,email,' . $this->route('admin_user')->id,
2829
];
2930
}
3031
}

app/Http/Requests/UpdateClientUser.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
//
27+
'name' => 'required|string|max:160',
28+
'email' => 'required|unique:users,email,' . $this->route('client_user')->id,
2829
];
2930
}
3031
}

app/Http/Requests/UpdateRole.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
//
27+
'name' => 'required|string|max:160|unique:roles,name,' . $this->route('role')->id
2828
];
2929
}
3030
}

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"laravel/passport": "^7.4",
1515
"laravel/tinker": "^1.0",
1616
"spatie/laravel-permission": "^3.0",
17-
"yajra/laravel-datatables-oracle": "~9.0"
17+
"yajra/laravel-datatables-oracle": "~9.0",
18+
"proengsoft/laravel-jsvalidation": ">2.2.0"
1819
},
1920
"require-dev": {
2021
"facade/ignition": "^1.4",
@@ -60,6 +61,9 @@
6061
],
6162
"post-create-project-cmd": [
6263
"@php artisan key:generate --ansi"
64+
],
65+
"post-update-cmd": [
66+
"php artisan vendor:publish --provider=\"Proengsoft\\JsValidation\\JsValidationServiceProvider\" --tag=public --force"
6367
]
6468
}
6569
}

composer.lock

Lines changed: 96 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/jsvalidation.php

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
* Default view used to render Javascript validation code
7+
*
8+
* Supported: 'jsvalidation::bootstrap', 'jsvalidation::bootstrap4'
9+
*/
10+
'view' => 'jsvalidation::bootstrap4',
11+
12+
/*
13+
* Default JQuery selector find the form to be validated.
14+
* By default, the validations are applied to all forms.
15+
*/
16+
'form_selector' => 'form',
17+
18+
/*
19+
* If you change the focus on detect some error then active
20+
* this parameter to move the focus to the first error found.
21+
*/
22+
'focus_on_error' => false,
23+
24+
/*
25+
* Duration time for the animation when We are moving the focus
26+
* to the first error, http://api.jquery.com/animate/ for more information.
27+
*/
28+
'duration_animate' => 1000,
29+
30+
/*
31+
* Enable or disable Ajax validations of Database and custom rules.
32+
* By default Unique, ActiveURL, Exists and custom validations are validated via AJAX
33+
*/
34+
'disable_remote_validation' => false,
35+
36+
/*
37+
* Field name used in the remote validation Ajax request
38+
* You can change this value to avoid conflicts wth your field names
39+
*/
40+
'remote_validation_field' => '_jsvalidation',
41+
42+
];

0 commit comments

Comments
 (0)