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

[bookstack] / resources / views / books / form.blade.php

diff --git a/resources/views/books/form.blade.php b/resources/views/books/form.blade.php
index 8960b41359584ceb2cdec3b41039a90f0b1bfdde..91a3899de34f9d06e21015d840c85540e195046b 100644 (file)
--- a/resources/views/books/form.blade.php
+++ b/resources/views/books/form.blade.php
@@ -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>
\ No newline at end of file