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: Renamed sort set to sort rule

Browse Source 
Renamed based on feedback from Tim and Script on Discord.
Also fixed flaky test
This commit is contained in:
Dan Brown
2025-02-11 14:36:25 +00:00
parent a208c46b62
commit b9306a9029
30 changed files with 232 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
namespace BookStack\Entities\Models;
use BookStack\Sorting\SortSet;
use BookStack\Sorting\SortRule;
use BookStack\Uploads\Image;
use Exception;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@ -17,14 +17,14 @@ use Illuminate\Support\Collection;
* @property string $description
* @property int $image_id
* @property ?int $default_template_id
* @property ?int $sort_set_id
* @property ?int $sort_rule_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
* @property ?SortRule $sortRule
*/
class Book extends Entity implements HasCoverImage
{
@ -88,9 +88,9 @@ class Book extends Entity implements HasCoverImage
/**
* Get the sort set assigned to this book, if existing.
*/
public function sortSet(): BelongsTo
public function sortRule(): BelongsTo
{
return $this->belongsTo(SortSet::class);
return $this->belongsTo(SortRule::class);
}
/**