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

Hotfix 3.1.6 (#2068) #534

Merged

Conversation

themerekat
Copy link
Collaborator

@themerekat themerekat commented Jan 17, 2025

  • Minor editor fix
  • Remove head from editor due to causing more disruptions than benefits due to variations within portals central css stylings. Best to integrate head into new redesign of occurrence editor.

Fix transfer taxa form so that action is submited in the request

Issue BioKIC#1975

Summary

input id value for email was "login" and css rule #login {float: right} was being applied to this accidently causing some odd behavior. Changed id of login so the collid wouldn't happen and bumped the width of the form so that it will display correctly.

  • resolve merge conflict

  • Occurrence Profile bugs

  • Adjust editor permissions check so that it includes creator of general research collections (observerUid = active user)
  • Avoid double sanitation of identifier and collector

Fixes minor typo that occurs in error message

  • hotfix - protection
  • If collid input is a number + single quote, assume it's an SQL Inject support and set value to 0, which returns nothing, rather than putting a load on the server
  • Institution Sanitation issue
  • API Annotation Bug
  • Fix issue with missing recordID field from SQL statement definition
  • added the changes to hotfix

  • Bug adding image

  • If user is null, user verification code incorrectly checks to see if there is a user with an empty string username or email. Thus, add code that skips checking user table if login details are an empty value
  • Don't add empty strings to database. Keep them as null values.
  • Comment out user verification check. Just test to make sure it's a number.

Issue BioKIC#2040

Summary

Adds extra sort conditions so that records are sorted by sciname after being storted by family.

Issues BioKIC#2049

Summary

Fixes typo for IMAGE_ROOT_PATH and IMAGE_ROOT_URL global variables. Note this will be overritten in the coming 3.2 changes with the multimedia changes so maybe it would be worth merging.

Issues BioKIC#2064

Summary

Adds as is_numeric check on 'page' request variable so that the $pageNumber variable is alwasys a number

See BioKIC#1702 (comment)

  • Update db_schema_patch-3.1.sql
  • removed arrow functions and union types

  • replaced str_contains with str_pos

GregoryPost and others added 2 commits January 16, 2025 12:41
* Minor editor fix

- Remove head from editor due to causing more disruptions than benefits due to variations within portals central css stylings. Best to integrate head into new redesign of occurrence editor.

* Update hotfix version (3.1.6)

* closes #1954 Fixes use of hidden button and button submit value

Fix transfer taxa form so that action is submited in the request

* Fixing Login Form CSS closes #1975

# Issue #1975

# Summary
input id value for email was "login" and css rule `#login {float:
right}` was being applied to this accidently causing some odd behavior.
Changed id of login so the collid wouldn't happen and bumped the width
of the form so that it will display correctly.

* resolve merge conflict

* Occurrence Profile bugs

- Adjust editor permissions check so that it includes  creator of general research collections (observerUid = active user)
- Avoid double sanitation of identifier and collector

* Update geolocate.php (#1996)

Fixes minor typo that occurs in error message

* hotfix - protection

- If collid input is a number + single quote, assume it's an SQL Inject support and set value to 0, which returns nothing, rather than putting a load on the server

* Institution Sanitation issue

- Remove sanitation off outbound notes content to avoid interfering with embedded html tags that are added when this field is appended with GriSciColl info.
- Remove sanitation notes which were only meant to communicate to internal team when sanitation content was originally added.
Resolves following issue, in part: #1982

* API Annotation Bug

- Fix issue with missing recordID field from SQL statement definition

* added the changes to hotfix

* Bug adding image

- If user is null, user verification code incorrectly checks to see if there is a user with an empty string username or email. Thus, add code that skips checking user table if login details are an empty value
- Don't add empty strings to database. Keep them as null values.
- Comment out user verification check. Just test to make sure it's a number.

* remove associations changes

* Closes #2040 Sorts By Sciname within family (#2052)

# Issue #2040

# Summary
Adds extra sort conditions so that records are sorted by sciname after
being storted by family.

* Closes #2049 Fixes typo on globals variable

# Issues #2049

# Summary
Fixes typo for `IMAGE_ROOT_PATH` and `IMAGE_ROOT_URL` global variables.
Note this will be overritten in the coming 3.2 changes with the
multimedia changes so maybe it would be worth merging.

* Fix country synonyms, some U.S. states, add U.S. state abbreviations (#2059)

* Closes #2064 Fixing String Number multiply

# Issues #2064

# Summary
Adds as is_numeric check on 'page' request variable so that the
`$pageNumber` variable is alwasys a number

* Update geolocate.php per Nelson's suggestion (#2066)

See #1702 (comment)

Co-authored-by: Edward Gilbert <[email protected]>

* Update db_schema_patch-3.1.sql

- Explicitly set the index for omoccurrences.locality to a length of 100, thus avoid DB setting it to a default larger length that is beyond what is needed nor practical.
Addresses issue: #2050

* removed arrow functions and union types

* replaced str_contains with str_pos

---------

Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
Co-authored-by: Logan Wilt <[email protected]>
Co-authored-by: atticus29 <[email protected]>
Co-authored-by: Lindsay Walker <[email protected]>
Co-authored-by: Nikita Salikov <[email protected]>
Co-authored-by: NikitaSalikov <[email protected]>
Co-authored-by: Katie Pearson <[email protected]>
@themerekat themerekat merged commit 7dba6c7 into bryo-lichen:bryophyte-refactor-3.1 Jan 17, 2025
@themerekat themerekat deleted the resolve-conflict branch January 17, 2025 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants