webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-09 10:22:51 +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

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);