Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow book, shelf, settings & profile form input validation to skip image

Browse Source
This commit is contained in:
TBK 2020-03-04 00:05:47 +01:00
parent d3737d5a87
commit 57f587a78b
No known key found for this signature in database
GPG Key ID: 6D4FD19CB66C95EA
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/BookController.php
View File

@ -86,7 +86,7 @@ class BookController extends Controller
$this->validate($request, [ $this->validate($request, [
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'description' => 'string|max:1000', 'description' => 'string|max:1000',
'image' => $this->getImageValidationRules(), 'image' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
$bookshelf = null; $bookshelf = null;
@ -153,7 +153,7 @@ class BookController extends Controller
$this->validate($request, [ $this->validate($request, [
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'description' => 'string|max:1000', 'description' => 'string|max:1000',
'image' => $this->getImageValidationRules(), 'image' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
$book = $this->bookRepo->update($book, $request->all()); $book = $this->bookRepo->update($book, $request->all());

4
app/Http/Controllers/BookshelfController.php
View File

@ -85,7 +85,7 @@ class BookshelfController extends Controller
$this->validate($request, [ $this->validate($request, [
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'description' => 'string|max:1000', 'description' => 'string|max:1000',
'image' => $this->getImageValidationRules(), 'image' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
$bookIds = explode(',', $request->get('books', '')); $bookIds = explode(',', $request->get('books', ''));
@ -146,7 +146,7 @@ class BookshelfController extends Controller
$this->validate($request, [ $this->validate($request, [
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'description' => 'string|max:1000', 'description' => 'string|max:1000',
'image' => $this->getImageValidationRules(), 'image' => 'nullable|' . $this->getImageValidationRules(),
]); ]);

2
app/Http/Controllers/SettingController.php
View File

@ -44,7 +44,7 @@ class SettingController extends Controller
$this->preventAccessInDemoMode(); $this->preventAccessInDemoMode();
$this->checkPermission('settings-manage'); $this->checkPermission('settings-manage');
$this->validate($request, [ $this->validate($request, [
'app_logo' => $this->getImageValidationRules(), 'app_logo' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
// Cycles through posted settings and update them // Cycles through posted settings and update them

2
app/Http/Controllers/UserController.php
View File

@ -155,7 +155,7 @@ class UserController extends Controller
'password' => 'min:6|required_with:password_confirm', 'password' => 'min:6|required_with:password_confirm',
'password-confirm' => 'same:password|required_with:password', 'password-confirm' => 'same:password|required_with:password',
'setting' => 'array', 'setting' => 'array',
'profile_image' => $this->getImageValidationRules(), 'profile_image' => 'nullable|' . $this->getImageValidationRules(),
]); ]);
$user = $this->userRepo->getById($id); $user = $this->userRepo->getById($id);