Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

[Core: Module] Fix errors in 500-reponse logic #4193

Merged
merged 3 commits into from
Dec 17, 2018
Merged

[Core: Module] Fix errors in 500-reponse logic #4193

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f62c0c0
[Core: Module] Fix TypeError caused by unset User
johnsaigle Dec 11, 2018
6f30fbc
Change LorisException to NotFound
johnsaigle Dec 11, 2018
c248ae3
Add clarifying documentation
johnsaigle Dec 11, 2018
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
4 changes: 2 additions & 2 deletions modules/instrument_list/php/instrument_list.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ class Instrument_List extends \NDB_Menu_Filter
$user =& \User::singleton();
$timePoint = $this->timePoint;
if ($timePoint === null) {
throw new \LorisException("Page requires a timepoint to load");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were being caught by https://github.com/aces/Loris/pull/4163/files#diff-b9919f169806c905a8606fd31442044fR304, preventing instrument_list from loading.

throw new \NotFound("Page requires a timepoint to load");
}
$candidate = $this->candidate;
if ($candidate === null) {
throw new \LorisException("Page requires a candidate to load");
throw new \NotFound("Page requires a candidate to load");
}

//These variable are only for checking the permissions.
Expand Down
5 changes: 3 additions & 2 deletions php/libraries/Module.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ class Module extends \LORIS\Router\PrefixRouter implements RequestHandlerInterfa
}

try {
$user = $request->getAttribute("user") ?? new \LORIS\AnonymousUser();
$page = $this->loadPage($pagename);
// FIXME: Hack required for breadcrumbs. This should be removed,
// but some tests depend on it.
Expand All @@ -258,7 +259,7 @@ class Module extends \LORIS\Router\PrefixRouter implements RequestHandlerInterfa

if ($page->_hasAccess() !== true) {
return (new \LORIS\Middleware\PageDecorationMiddleware(
$request->getAttribute("user") ?? new \LORIS\AnonymousUser()
$user
))->process(
$request,
new \LORIS\Router\NoopResponder(
Expand All @@ -272,7 +273,7 @@ class Module extends \LORIS\Router\PrefixRouter implements RequestHandlerInterfa
}
} catch (\NotFound $e) {
return (new \LORIS\Middleware\PageDecorationMiddleware(
$request->getAttribute("user") ?? new \LORIS\AnonymousUser()
$user
))->process(
$request,
new \LORIS\Router\NoopResponder(
Expand Down