webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Sorting: Connected up default sort setting for books

Browse Source
This commit is contained in:
Dan Brown
2025-02-05 14:33:46 +00:00
parent b897af2ed0
commit 7093daa49d
7 changed files with 77 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Entities/Models/Book.php
View File

@ -2,6 +2,7 @@
namespace BookStack\Entities\Models;
use BookStack\Sorting\SortSet;
use BookStack\Uploads\Image;
use Exception;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@ -16,12 +17,14 @@ use Illuminate\Support\Collection;
* @property string $description
* @property int $image_id
* @property ?int $default_template_id
* @property ?int $sort_set_id
* @property Image|null $cover
* @property \Illuminate\Database\Eloquent\Collection $chapters
* @property \Illuminate\Database\Eloquent\Collection $pages
* @property \Illuminate\Database\Eloquent\Collection $directPages
* @property \Illuminate\Database\Eloquent\Collection $shelves
* @property ?Page $defaultTemplate
* @property ?SortSet $sortSet
*/
class Book extends Entity implements HasCoverImage
{
@ -82,6 +85,14 @@ class Book extends Entity implements HasCoverImage
return $this->belongsTo(Page::class, 'default_template_id');
}
/**
* Get the sort set assigned to this book, if existing.
*/
public function sortSet(): BelongsTo
{
return $this->belongsTo(SortSet::class);
}
/**
* Get all pages within this book.
*/

7
app/Entities/Repos/BookRepo.php
View File

@ -8,6 +8,7 @@ use BookStack\Entities\Models\Book;
use BookStack\Entities\Tools\TrashCan;
use BookStack\Exceptions\ImageUploadException;
use BookStack\Facades\Activity;
use BookStack\Sorting\SortSet;
use BookStack\Uploads\ImageRepo;
use Exception;
use Illuminate\Http\UploadedFile;
@ -33,6 +34,12 @@ class BookRepo
$this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id'] ?? null));
Activity::add(ActivityType::BOOK_CREATE, $book);
$defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
if ($defaultBookSortSetting && SortSet::query()->find($defaultBookSortSetting)) {
$book->sort_set_id = $defaultBookSortSetting;
$book->save();
}
return $book;
}

7
app/Sorting/SortSet.php
View File

@ -3,8 +3,10 @@
namespace BookStack\Sorting;
use BookStack\Activity\Models\Loggable;
use BookStack\Entities\Models\Book;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
/**
* @property int $id
@ -41,4 +43,9 @@ class SortSet extends Model implements Loggable
{
return url("/settings/sorting/sets/{$this->id}");
}
public function books(): HasMany
{
return $this->hasMany(Book::class);
}
}

13
app/Sorting/SortSetController.php
View File

@ -62,7 +62,7 @@ class SortSetController extends Controller
$set = SortSet::query()->findOrFail($id);
$operations = SortSetOperation::fromSequence($request->input('sequence'));
if (count($operations) === 0) {
return redirect()->withInput()->withErrors(['sequence' => 'No operations set.']);
return redirect($set->getUrl())->withInput()->withErrors(['sequence' => 'No operations set.']);
}
$set->name = $request->input('name');
@ -78,7 +78,16 @@ class SortSetController extends Controller
{
$set = SortSet::query()->findOrFail($id);
// TODO - Check if it's in use
if ($set->books()->count() > 0) {
$this->showErrorNotification(trans('settings.sort_set_delete_fail_books'));
return redirect($set->getUrl());
}
$defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
if ($defaultBookSortSetting === intval($id)) {
$this->showErrorNotification(trans('settings.sort_set_delete_fail_default'));
return redirect($set->getUrl());
}
$set->delete();
$this->logActivity(ActivityType::SORT_SET_DELETE, $set);