diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-11-10 21:32:55 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-11-10 21:32:55 +0000 |
| commit | 316db80e709293a27b978f08374c9cd185a17bd7 (patch) | |
| tree | 860177e28780955818bd0997e7ddf36be5493089 | |
| parent | 7da59459fd83e1b1aff2502b09b343338da0e0ce (diff) | |
| download | webtrees-316db80e709293a27b978f08374c9cd185a17bd7.tar.gz webtrees-316db80e709293a27b978f08374c9cd185a17bd7.tar.bz2 webtrees-316db80e709293a27b978f08374c9cd185a17bd7.zip | |
Fix: #2764 - routing error when editing shared notes
| -rw-r--r-- | app/Http/Controllers/EditNoteController.php | 5 | ||||
| -rw-r--r-- | app/Http/Routes/WebRoutes.php | 4 | ||||
| -rw-r--r-- | resources/views/edit/shared-note.phtml | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/Http/Controllers/EditNoteController.php b/app/Http/Controllers/EditNoteController.php index 6fe0cb48cb..5118d6664e 100644 --- a/app/Http/Controllers/EditNoteController.php +++ b/app/Http/Controllers/EditNoteController.php @@ -27,6 +27,7 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use function assert; +use function is_string; /** * Controller for edit forms and responses. @@ -45,7 +46,7 @@ class EditNoteController extends AbstractEditController $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $xref = $request->getQueryParams()['xref']; + $xref = $request->getAttribute('xref'); $note = Note::getInstance($xref, $tree); $note = Auth::checkNoteAccess($note, true); @@ -69,7 +70,7 @@ class EditNoteController extends AbstractEditController $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $xref = $request->getQueryParams()['xref']; + $xref = $request->getAttribute('xref'); $note = Note::getInstance($xref, $tree); $note = Auth::checkNoteAccess($note, true); diff --git a/app/Http/Routes/WebRoutes.php b/app/Http/Routes/WebRoutes.php index 0392da3b70..c61f54c617 100644 --- a/app/Http/Routes/WebRoutes.php +++ b/app/Http/Routes/WebRoutes.php @@ -366,8 +366,8 @@ class WebRoutes $router->get(EditFact::class, '/edit-fact', EditFact::class); $router->get('edit-media-file', '/edit-media-file', 'EditMediaController::editMediaFile'); $router->post('edit-media-file-update', '/edit-media-file', 'EditMediaController::editMediaFileAction'); - $router->get('edit-note-object', '/edit-note-object', 'EditNoteController::editNoteObject'); - $router->post('edit-note-object-action', '/edit-note-object', 'EditNoteController::updateNoteObject'); + $router->get('edit-note-object', '/edit-note-object/{xref}', 'EditNoteController::editNoteObject'); + $router->post('edit-note-object-action', '/edit-note-object/{xref}', 'EditNoteController::updateNoteObject'); $router->get(EditRawFactPage::class, '/edit-raw/{xref}/{fact_id}', EditRawFactPage::class); $router->post(EditRawFactAction::class, '/edit-raw/{xref}/{fact_id}', EditRawFactAction::class); $router->get(EditRawRecordPage::class, '/edit-raw/{xref}', EditRawRecordPage::class); diff --git a/resources/views/edit/shared-note.phtml b/resources/views/edit/shared-note.phtml index 7833e34268..50951decc3 100644 --- a/resources/views/edit/shared-note.phtml +++ b/resources/views/edit/shared-note.phtml @@ -2,7 +2,7 @@ <h2 class="wt-page-title"><?= $title ?></h2> -<form method="post" action="<?= e(route('edit-note-object-action')) ?>" class="wt-page-options"> +<form method="post" action="<?= e(route('edit-note-object-action', ['tree' => $tree->name(), 'xref' => $note->xref()])) ?>" class="wt-page-options"> <?= csrf_field() ?> <div class="row form-group"> |