diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2021-01-29 16:11:52 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2021-01-29 16:14:21 +0000 |
| commit | c532e5bbfb7e07b4bacf8fa7c4fdd95577124aae (patch) | |
| tree | 07934e00abff968feb77008fa7e52f7e7d474fb5 /resources | |
| parent | 203146cff8b7a9a01068c72c858e6d2d9a9e7bdb (diff) | |
| download | webtrees-c532e5bbfb7e07b4bacf8fa7c4fdd95577124aae.tar.gz webtrees-c532e5bbfb7e07b4bacf8fa7c4fdd95577124aae.tar.bz2 webtrees-c532e5bbfb7e07b4bacf8fa7c4fdd95577124aae.zip | |
Redirect to individual page after adding/editing story
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/views/modules/stories/edit.phtml | 17 | ||||
| -rw-r--r-- | resources/views/modules/stories/tab.phtml | 13 |
2 files changed, 27 insertions, 3 deletions
diff --git a/resources/views/modules/stories/edit.phtml b/resources/views/modules/stories/edit.phtml index ad19e35feb..99a2bd0661 100644 --- a/resources/views/modules/stories/edit.phtml +++ b/resources/views/modules/stories/edit.phtml @@ -3,6 +3,19 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesAllPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var int $block_id + * @var Individual $individual + * @var array<string> $languages + * @var string $story_body + * @var string $story_title + * @var string $title + * @var Tree $tree + * @var string $url + */ ?> @@ -13,6 +26,8 @@ use Fisharebest\Webtrees\I18N; <form method="post" action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $block_id, 'tree' => $tree->name()])) ?>" class="form-horizontal"> <?= csrf_field() ?> + <input type="hidden" name="url" value="<?= e($url) ?>"> + <div class="row form-group"> <label for="xref" class="col-sm-3 col-form-label"> <?= I18N::translate('Individual') ?> @@ -56,7 +71,7 @@ use Fisharebest\Webtrees\I18N; <?= I18N::translate('save') ?> </button> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'Admin', 'tree' => $tree->name()])) ?>" class="btn btn-secondary"> + <a href="<?= e($url ?: route('module', ['module' => 'stories', 'action' => 'Admin', 'tree' => $tree->name()])) ?>" class="btn btn-secondary"> <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/modules/stories/tab.phtml b/resources/views/modules/stories/tab.phtml index 1305d5a820..a549d3cde9 100644 --- a/resources/views/modules/stories/tab.phtml +++ b/resources/views/modules/stories/tab.phtml @@ -1,6 +1,15 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var bool $is_admin + * @var Individual $individual + * @var array<stdClass> $stories + * @var Tree $tree + */ ?> @@ -14,7 +23,7 @@ use Fisharebest\Webtrees\I18N; </div> <?php if ($is_admin) : ?> <div class="story_edit"> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $story->block_id, 'tree' => $tree->name()])) ?>"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $story->block_id, 'tree' => $tree->name(), 'url' => $individual->url()])) ?>"> <?= I18N::translate('Edit the story') ?> </a> </div> @@ -23,7 +32,7 @@ use Fisharebest\Webtrees\I18N; <?php if ($is_admin && $stories === []) : ?> <div> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->xref(), 'tree' => $tree->name()])) ?>"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->xref(), 'tree' => $tree->name(), 'url' => $individual->url()])) ?>"> <?= I18N::translate('Add a story') ?> </a> </div> |