Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssddanbrown merged 1 commit into from
Oct 27, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion resources/views/books/form.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
26 changes: 26 additions & 0 deletions tests/Entity/EntityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php namespace Tests;

use BookStack\Entities\Bookshelf;
use BookStack\Entities\Book;
use BookStack\Entities\Chapter;
use BookStack\Entities\Page;
Expand Down Expand Up @@ -292,4 +293,29 @@ public function test_slug_format()
$this->assertEquals('parta-partb-partc', $book->slug);
}

public function test_shelf_cancel_creation_returns_to_correct_place()
{
$shelf = Bookshelf::first();

// Cancel button from shelf goes back to shelf
$this->asEditor()->visit($shelf->getUrl('/create-book'))
->see('Cancel')
->click('Cancel')
->seePageIs($shelf->getUrl());

// Cancel button from books goes back to books
$this->asEditor()->visit('/create-book')
->see('Cancel')
->click('Cancel')
->seePageIs('/books');

// Cancel button from book edit goes back to book
$book = Book::first();

$this->asEditor()->visit($book->getUrl('/edit'))
->see('Cancel')
->click('Cancel')
->seePageIs($book->getUrl());
}

}