webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Fix Book form (create) returning to the full books list on cancel

Browse Source 
Fixes #1662
Added a small block of logic to determine the correct URL to attribute to the cancel button on a given page create form.
If adding a book from a bookshelf, return to the bookshelf. If editing a book, return to the book. In all other cases, return to the full books list.
This commit is contained in:
Christopher Wilkinson
2019-09-26 22:51:24 +01:00
parent 7cd956b24b
commit 2f94f078e3
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resources/views/books/form.blade.php
View File

@ -36,6 +36,15 @@
</div>
<div class="form-group text-right">
<a href="{{ isset($book) ? $book->getUrl() : url('/books') }}" class="button outline">{{ trans('common.cancel') }}</a>
<?php
if (isset($bookshelf)) {
$cancelUrl = $bookshelf->getUrl();
} else if (isset($book)) {
$cancelUrl = $book->getUrl();
} else {
$cancelUrl = '/books';
}
?>
<a href="{{ $cancelUrl }}" class="button outline">{{ trans('common.cancel') }}</a>
<button type="submit" class="button">{{ trans('entities.books_save') }}</button>
</div>