github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-06 10:44:33 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updated existing image tests to reflect changes

Browse Source 
- Also added some new tests
This commit is contained in:
Dan Brown
2019-05-04 18:11:00 +01:00
parent 79f6dc00a3
commit 8c190324ac
7 changed files with 146 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Entities/Repos/EntityRepo.php
View File

@ -762,7 +762,7 @@ class EntityRepo
*/
public function searchForImage($imageString)
{
$pages = $this->entityQuery('page')->where('html', 'like', '%' . $imageString . '%')->get();
$pages = $this->entityQuery('page')->where('html', 'like', '%' . $imageString . '%')->get(['id', 'name', 'slug', 'book_id']);
foreach ($pages as $page) {
$page->url = $page->getUrl();
$page->html = '';

2
app/Http/Controllers/Images/ImageController.php
View File

@ -103,7 +103,7 @@ class ImageController extends Controller
*/
protected function checkImagePermission(Image $image)
{
if ($image->type !== 'drawio' || $image->type !== 'gallery') {
if ($image->type !== 'drawio' && $image->type !== 'gallery') {
$this->showPermissionError();
}

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

@ -98,7 +98,6 @@ class UserController extends Controller
$this->userRepo->setUserRoles($user, $roles);
}
// TODO - Check this uses new profile assignment
$this->userRepo->downloadAndAssignUserAvatar($user);
return redirect('/settings/users');

4
app/Uploads/ImageRepo.php
View File

@ -232,8 +232,8 @@ class ImageRepo
protected function loadThumbs(Image $image)
{
$image->thumbs = [
'gallery' => $this->getThumbnail($image, 150, 150),
'display' => $this->getThumbnail($image, 840, 0, true)
'gallery' => $this->getThumbnail($image, 150, 150, false),
'display' => $this->getThumbnail($image, 840, null, true)
];
}

3
app/Uploads/ImageService.php
View File

@ -235,7 +235,7 @@ class ImageService extends UploadService
* @return string
* @throws ImageUploadException
*/
protected function resizeImage(string $imageData, $width = 220, $height = null, $keepRatio = true)
protected function resizeImage(string $imageData, $width = 220, $height = null, bool $keepRatio = true)
{
try {
$thumb = $this->imageTool->make($imageData);
@ -336,6 +336,7 @@ class ImageService extends UploadService
$image = $this->saveNewFromUrl($userAvatarUrl, 'user', $imageName);
$image->created_by = $user->id;
$image->updated_by = $user->id;
$image->uploaded_to = $user->id;
$image->save();
return $image;