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

Collections search fix #1717

Open
wants to merge 2 commits into
base: Development
Choose a base branch
from

Conversation

NikitaSalikov
Copy link
Collaborator

Changes Made:

removed line that adds category value to collections list which created an issue when category value is the same as some collection's value giving the wrong result.

Pull Request Checklist:

Pre-Approval

  • There is a description section in the pull request that details what the proposed changes do. It can be very brief if need be, but it ought to exist.
  • Hotfixes should be branched off of the master branch and squash and merged back into the master branch.
  • Features and backlog bugs should be merged into the Development branch, NOT master
  • All new text is preferably internationalized (i.e., no end-user-visible text is hard-coded on the PHP pages), and the spreadsheet tracking internationalizations has been updated either with a new row or with checkmarks to existing rows.
  • There are no linter errors
  • New features have responsive design (i.e., look aesthetically pleasing both full screen and with small or mobile screens)
  • Symbiota coding standards have been followed
  • If any files have been reformatted (e.g., by an autoformatter), the reformat is its own, separate commit in the PR
  • Comment which GitHub issue(s), if any does this PR address:
    [3.1] Excluding collections from search results is not working #1703
  • If this PR makes any changes that would require additional configuration of any Symbiota portals outside of the files tracked in this repository, make sure that those changes are detailed in this document.

Post-Approval

  • It is the code author's responsibility to merge their own pull request after it has been approved
  • If this PR represents a merge into the Development branch, remember to use the squash & merge option
  • If this PR represents a merge from the Development branch into the master branch, remember to use the merge option
  • If this PR represents a hotfix into the master branch, a subsequent PR from master into Development should be made merge option (i.e., no squash).
  • If the dev team has agreed that this PR represents the last PR going into the Development branch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock the Development branch to prevent accidental merges while QA takes place. Follow the release protocol here.
  • Don't forget to delete your feature branch upon merge. Ignore this step as required.

Thanks for contributing and keeping it clean!

@egbot
Copy link
Member

egbot commented Sep 26, 2024

If this fixes the following issue, it might be best for this fix to be pushed as a Hotfix.
#1703

Copy link
Collaborator

@Atticus29 Atticus29 left a comment

Choose a reason for hiding this comment

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

This seems to work exactly as expected. I kicked the tires around my local machine, looking for reversions (why would I have included '#search-form-colls input[name="cat[]"]:checked' ??), and couldn't find any.

On the github issue, Ed mentions that there's still a stlying fix that would need to accompany this (see #1703 (comment)).

Could I trouble you to implement the js fix as well?

@NikitaSalikov
Copy link
Collaborator Author

This seems to work exactly as expected. I kicked the tires around my local machine, looking for reversions (why would I have included '#search-form-colls input[name="cat[]"]:checked' ??), and couldn't find any.

On the github issue, Ed mentions that there's still a stlying fix that would need to accompany this (see #1703 (comment)).

Could I trouble you to implement the js fix as well?

I believe I fixed this. Also fixed the map search issue when deselecting category wouldn't deselect "Select/Deselect all collections" checkbox.

Copy link
Collaborator

@themerekat themerekat left a comment

Choose a reason for hiding this comment

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

Seems to be working great!

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.

4 participants