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

[3.2] Bugfix issue #2136 remove asterisk in view mode #2199

Merged
merged 3 commits into from
Feb 11, 2025

Conversation

Atticus29
Copy link
Collaborator

Description

This PR closes #2136 by only showing the required asterisk when in edit mode.

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 PR'd using the merge option (not squashed) into the hotfix branch.
    • N/A
  • 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.
    • N/A
  • There are no linter errors
  • New features have responsive design (i.e., look aesthetically pleasing both full screen and with small or mobile screens)
    • N/A
  • 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
    • N/A
  • Comment which GitHub issue(s), if any does this PR address
  • 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.
    • N/A

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 into the hotfix branch, remember to use the merge option (i.e., no squash).
  • 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 merge from the hotfix branch into the master branch use the squash & merge option
    • a subsequent PR from master into Development should be made with the merge option (i.e., no squash).
    • Immediately delete the hotfix branch and create a new hotfix branch
    • increment the Symbiota version number in the symbase.php file and commit to the hotfix branch.
  • 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!

@Atticus29 Atticus29 marked this pull request as ready for review February 10, 2025 18:54
@Atticus29 Atticus29 requested a review from themerekat February 10, 2025 18:54
@themerekat
Copy link
Collaborator

@Atticus29 , I think either we need to remove the asterisk in edit mode completely (only show it in "add taxon" mode), or we need to add a legend for the asterisk. As it is, when you go to edit it, you see the asterisk, but you don't see any explanation for its appearance.

@Atticus29
Copy link
Collaborator Author

@Atticus29 , I think either we need to remove the asterisk in edit mode completely (only show it in "add taxon" mode), or we need to add a legend for the asterisk. As it is, when you go to edit it, you see the asterisk, but you don't see any explanation for its appearance.

This makes sense. I'll add a little legend.

@Atticus29
Copy link
Collaborator Author

@Atticus29 , I think either we need to remove the asterisk in edit mode completely (only show it in "add taxon" mode), or we need to add a legend for the asterisk. As it is, when you go to edit it, you see the asterisk, but you don't see any explanation for its appearance.

@themerekat I tried a fix in 0818276. What do you think?

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.

Looks great!

@Atticus29 Atticus29 merged commit 827011c into Development Feb 11, 2025
@Atticus29 Atticus29 deleted the 2136-remove-asterisk-in-display-mode branch February 11, 2025 21:48
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