github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-28 11:05:43 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Added chrome paste-image-upload. Closes #20.

Browse Source
This commit is contained in:
Dan Brown
2015-10-14 21:46:18 +01:00
parent 1520bde191
commit 7039695b65
6 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/ImageController.php
View File

@ -7,7 +7,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Intervention\Image\Facades\Image as ImageTool;
use Illuminate\Support\Facades\DB;
use BookStack\Http\Requests;
use BookStack\Image;
use BookStack\Repos\PageRepo;
@ -37,13 +36,13 @@ class ImageController extends Controller
public function getAll($page = 0)
{
$pageSize = 30;
$images = DB::table('images')->orderBy('created_at', 'desc')
$images = $this->image->orderBy('created_at', 'desc')
->skip($page * $pageSize)->take($pageSize)->get();
foreach ($images as $image) {
$image->thumbnail = $this->getThumbnail($image, 150, 150);
}
$hasMore = count(DB::table('images')->orderBy('created_at', 'desc')
->skip(($page + 1) * $pageSize)->take($pageSize)->get()) > 0;
$hasMore = $this->image->orderBy('created_at', 'desc')
->skip(($page + 1) * $pageSize)->take($pageSize)->count() > 0;
return response()->json([
'images' => $images,
'hasMore' => $hasMore
@ -105,8 +104,8 @@ class ImageController extends Controller
// Create and save image object
$this->image->name = $name;
$this->image->url = $imagePath . $storageName;
$this->image->created_by = Auth::user()->id;
$this->image->updated_by = Auth::user()->id;
$this->image->created_by = auth()->user()->id;
$this->image->updated_by = auth()->user()->id;
$this->image->save();
$this->image->thumbnail = $this->getThumbnail($this->image, 150, 150);
return response()->json($this->image);