luisgulo/BookStack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved image upload error handling and fixed bad user-avatar rewriting

Browse source
This commit is contained in:
Dan Brown 2016-01-17 15:19:26 +00:00
parent 0821672e70
commit bb87401d10
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Exceptions/ImageUploadException.php Normal file
View file

@ -0,0 +1,6 @@
<?php namespace BookStack\Exceptions;
use Exception;
class ImageUploadException extends Exception {}

9
app/Http/Controllers/ImageController.php
View file

@ -2,6 +2,7 @@
namespace BookStack\Http\Controllers;
use BookStack\Exceptions\ImageUploadException;
use BookStack\Repos\ImageRepo;
use Illuminate\Filesystem\Filesystem as File;
use Illuminate\Http\Request;
@ -69,7 +70,13 @@ class ImageController extends Controller
]);
$imageUpload = $request->file('file');
$image = $this->imageRepo->saveNew($imageUpload, $type);
try {
$image = $this->imageRepo->saveNew($imageUpload, $type);
} catch (ImageUploadException $e) {
return response($e->getMessage(), 500);
}
return response()->json($image);
}

1
resources/assets/js/directives.js
View file

@ -56,6 +56,7 @@ module.exports = function (ngApp) {
var usingIds = typeof scope.currentId !== 'undefined' || scope.currentId === 'false';
scope.image = scope.currentImage;
scope.value = scope.currentImage || '';
if (usingIds) scope.value = scope.currentId;
function setImage(imageModel, imageUrl) {
scope.image = imageUrl;