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.

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

Untitled #2

Merged
merged 89 commits into from
Apr 26, 2011
Merged

Untitled #2

merged 89 commits into from
Apr 26, 2011

Conversation

driusan
Copy link
Collaborator

@driusan driusan commented Feb 3, 2011

We haven't had a merge from IBIS to Loris Trunk since the initial move to github, and even then it wasn't complete. I think we to get the Loris Trunk completely up to date now that NeuroDevNet are (very) soon going to start using it.

driusan and others added 30 commits December 1, 2010 13:42
Added support for Candidate_Age and Window_Difference in non-proband instruments
ZainVirani referenced this pull request in ZainVirani/Loris Jul 4, 2017
Instrument logic parser
llevitis pushed a commit to llevitis/Loris that referenced this pull request Jul 10, 2017
[modules] added Behavioral & Imaging tabs
cmadjar referenced this pull request in cmadjar/Loris Sep 22, 2017
Run composer as part of the package build
ridz1208 pushed a commit to AnyhowStep/Loris that referenced this pull request Dec 23, 2017
maltheism referenced this pull request in maltheism/Loris May 8, 2018
# This is the 1st commit message:

fixing sql injection

fixing sql injection

Remove debugging line

Use ?? idiom replacement

# This is the commit message #2:

remove  variable that was used for debugging

# This is the commit message #3:

update comment to PHP 7
ZainVirani referenced this pull request in ZainVirani/Loris May 25, 2018
fix candidate issue and transpile
driusan pushed a commit that referenced this pull request May 28, 2018
* # This is a combination of 3 commits.
# This is the 1st commit message:

fixing sql injection

fixing sql injection

Remove debugging line

Use ?? idiom replacement

# This is the commit message #2:

remove  variable that was used for debugging

# This is the commit message #3:

update comment to PHP 7

* remove isset because using ?? idiom

* Cleanup variables not used and added logging with error message for user

* fix error message to display

* fix table name containing back ticks in database

* Using DB excape results in back ticks and need to be stripped

* remove debugging echo code

* function viewData() created and handles showing data with permission check

* revert changes to bugfix as was on wrong branch

* move function down

* travis cleanup

* spaces cleanup
@jftunteng jftunteng added this to the PRE 20.0.0 milestone Jan 7, 2020
HenriRabalais referenced this pull request in HenriRabalais/Loris Feb 17, 2020
driusan added a commit that referenced this pull request Oct 29, 2021
When accessing an instrument from RB, I got the error:

```
Fatal error: Uncaught TypeError: Argument 1 passed to ValidatableIdentifier::__construct() must be of the type string, null given, called in
/home/driusan/Code/Loris/php/libraries/NDB_BVL_Instrument.class.inc on line 2863 and defined in /home/driusan/Code/Loris/php/libraries/Valida
tableIdentifier.php:57 Stack trace: #0 /home/driusan/Code/Loris/php/libraries/NDB_BVL_Instrument.class.inc(2863): ValidatableIdentifier->__co
nstruct(NULL) #1 /home/driusan/Code/Loris/src/Middleware/UserPageDecorationMiddleware.php(241): NDB_BVL_Instrument->handle(Object(Laminas\Dia
ctoros\ServerRequest)) #2 /home/driusan/Code/Loris/src/Middleware/PageDecorationMiddleware.php(57): LORIS\Middleware\UserPageDecorationMiddle
ware->process(Object(Laminas\Diactoros\ServerRequest), Object(NDB_BVL_Instrument_aosi)) #3 /home/driusan/Code/Loris/php/libraries/NDB_Page.cl
ass.inc(735): LORIS\Middleware\PageDecorationMiddleware->process(Object(Laminas\Diactoros\ServerRequest), Object(NDB_BVL_Instrument_aosi)) #4
 /home/driusan/Code/Loris/php/libraries/NDB_BVL_In in /home/driusan/Code/Loris/php/libraries/ValidatableIdentifier.php on line 57
```

This fixes the type error so that the instrument page loads.
KLaFleur pushed a commit to KLaFleur/Loris that referenced this pull request Sep 20, 2022
driusan added a commit that referenced this pull request Jun 21, 2023
The CommentID is not part of the data, it's the foreign key used
between the flag table and the instrument table. JSON-based instruments
do not have it, and this ensures better consistency between the two
so that issues such as #8796 and #8801 will not vary based on instrument
type and will be caught sooner.

Resolves part of #8804 (Inconsistency #2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Cleanup PR or issue introducing/requiring at least one clean-up operation Feature PR or issue introducing/requiring at least one new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants