Fixed shelf activity display & updated book sort operation

This commit is contained in:
Dan Brown 2019-05-05 15:54:22 +01:00
parent 5910e00fb8
commit ba09dad1fe
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 15 additions and 16 deletions

View File

@ -108,13 +108,17 @@ class ActivityService
if ($entity->isA('book')) { if ($entity->isA('book')) {
$query = $this->activity->where('book_id', '=', $entity->id); $query = $this->activity->where('book_id', '=', $entity->id);
} else { } else {
$query = $this->activity->where('entity_type', '=', get_class($entity)) $query = $this->activity->where('entity_type', '=', $entity->getMorphClass())
->where('entity_id', '=', $entity->id); ->where('entity_id', '=', $entity->id);
} }
$activity = $this->permissionService $activity = $this->permissionService
->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type') ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
->orderBy('created_at', 'desc')->with(['entity', 'user.avatar'])->skip($count * ($page - 1))->take($count)->get(); ->orderBy('created_at', 'desc')
->with(['entity', 'user.avatar'])
->skip($count * ($page - 1))
->take($count)
->get();
return $this->filterSimilar($activity); return $this->filterSimilar($activity);
} }

View File

@ -415,6 +415,7 @@ class BookController extends Controller
{ {
// Update the cover image if in request // Update the cover image if in request
if ($request->has('image')) { if ($request->has('image')) {
$this->imageRepo->destroyImage($book->cover);
$newImage = $request->file('image'); $newImage = $request->file('image');
$image = $this->imageRepo->saveNew($newImage, 'cover_book', $book->id, 512, 512, true); $image = $this->imageRepo->saveNew($newImage, 'cover_book', $book->id, 512, 512, true);
$book->image_id = $image->id; $book->image_id = $image->id;

View File

@ -124,6 +124,7 @@ class BookshelfController extends Controller
$this->entityContextManager->setShelfContext($shelf->id); $this->entityContextManager->setShelfContext($shelf->id);
$this->setPageTitle($shelf->getShortName()); $this->setPageTitle($shelf->getShortName());
return view('shelves.show', [ return view('shelves.show', [
'shelf' => $shelf, 'shelf' => $shelf,
'books' => $books, 'books' => $books,
@ -287,6 +288,7 @@ class BookshelfController extends Controller
// Update the cover image if in request // Update the cover image if in request
if ($request->has('image')) { if ($request->has('image')) {
$newImage = $request->file('image'); $newImage = $request->file('image');
$this->imageRepo->destroyImage($shelf->cover);
$image = $this->imageRepo->saveNew($newImage, 'cover_shelf', $shelf->id, 512, 512, true); $image = $this->imageRepo->saveNew($newImage, 'cover_shelf', $shelf->id, 512, 512, true);
$shelf->image_id = $image->id; $shelf->image_id = $image->id;
$shelf->save(); $shelf->save();

View File

@ -456,6 +456,10 @@ ul.pagination {
position: relative; position: relative;
margin-right: $-l; margin-right: $-l;
&.entity-list-item-image-wide {
width: 220px;
}
.svg-icon { .svg-icon {
color: #FFF; color: #FFF;
fill: #FFF; fill: #FFF;

View File

@ -222,18 +222,6 @@ $btt-size: 40px;
} }
} }
.center-box {
margin: $-xxl auto 0 auto;
width: 420px;
max-width: 100%;
display: inline-block;
text-align: left;
vertical-align: top;
input {
width: 100%;
}
}
.fullscreen { .fullscreen {
border:0; border:0;
position:fixed; position:fixed;

View File

@ -150,8 +150,8 @@
return bTime - aTime; return bTime - aTime;
}, },
updated: function(a, b) { updated: function(a, b) {
const aTime = Number(a.getAttribute('data-update')); const aTime = Number(a.getAttribute('data-updated'));
const bTime = Number(b.getAttribute('data-update')); const bTime = Number(b.getAttribute('data-updated'));
return bTime - aTime; return bTime - aTime;
}, },
chaptersFirst: function(a, b) { chaptersFirst: function(a, b) {