Skip to content
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

[core] Fix incorrect message/error for instrument access #8284

Merged
merged 4 commits into from
Jan 12, 2023
Merged

[core] Fix incorrect message/error for instrument access #8284

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4aa4c6c
Fix incorrect message/error for instrument access
regisoc Dec 18, 2022
0470195
check
regisoc Dec 19, 2022
decf5ae
wrap into asArray
regisoc Dec 20, 2022
39a39d8
check
regisoc Dec 20, 2022
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
12 changes: 10 additions & 2 deletions php/libraries/NDB_BVL_Instrument.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,18 @@ abstract class NDB_BVL_Instrument extends NDB_Page
} else { //check if user has instrument's permissions
//is the instrument listed at all in instrumentPermissions?
$instrumentListed = false;
foreach ($instrumentPermissions["instrument"] as $instrument) {
// get an array of instruments
// if one instrument, get it into an array
$instrumentList = Utility::asArray(
$instrumentPermissions["instrument"]
);
// iterate through instruments
foreach ($instrumentList as $instrument) {
if ($instrument["Test_name"] == $this->testName) {
$instrumentListed = true;
$instrumentPerms = Utility::asArray($instrument["permission"]);
$instrumentPerms = Utility::asArray(
$instrument["permission"]
);
}
}

Expand Down