Skip to content

Fix Reference keyword export: use correct keyword variable and case-insensitive match #1272

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

Open
eodorfman111 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix Reference keyword export: use correct keyword variable and case-insensitive match #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f705fb
Update individualAddEncounter.html
eodorfman111 Aug 28, 2025
13e6deb
Fix Reference keyword export (case-insensitive)
eodorfman111 Oct 7, 2025
802917a
Fix reference keyword export: use correct keyword variable
eodorfman111 Oct 7, 2025
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
6 changes: 3 additions & 3 deletions src/main/java/org/ecocean/servlet/export/EncounterAnnotationExportExcelFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@ else if (exportCol.isFor(Keyword.class)) {
boolean keywordFound = false;
for (MediaAsset ma : mas) {
for (Keyword kw : ma.getKeywordsStrict()) {
if (kw != null && kw.getReadableName().equals(REFERENCE_KEYWORD)) {
exportCol.writeLabel(kw, row, sheet);
keywordFound = true;
if (kw != null && kw.getReadableName().equalsIgnoreCase(REFERENCE_KEYWORD)) {
exportCol.writeLabel(kw, row, sheet);;
keywordFound = true;
break;
}
}
Expand Down
28 changes: 6 additions & 22 deletions src/main/resources/emails/en/individualAddEncounter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,25 +341,10 @@ <h1 style="Margin:0;Margin-bottom:10px;color:#005589;font-family:Helvetica,Arial

<p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">LEGAL
STATEMENT</p>
<p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">Wildbook
is copyrighted
2025 by Conservation X Labs.
Individual
contributors to
Wildbook retain
copyrights for
submitted
images. No
reproduction or
usage of
material in this
library is
permitted
without the
express
permission of
the copyright
holders.</p>
<p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">
&copy; 2025 Conservation X Labs. Individual contributors to Wildbook retain copyrights for submitted images.
No reproduction or usage of material in this library is permitted without the express permission of the copyright holders. </p>

<table class="spacer"

style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%">
Expand All @@ -371,11 +356,10 @@ <h1 style="Margin:0;Margin-bottom:10px;color:#005589;font-family:Helvetica,Arial
</tr>
</tbody>
</table>
<p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">Do not reply to this email. For questions and comments, go to [
<p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;text-align:left">Do not reply to this email. For questions and comments, go to
<a href="@WILDBOOK_COMMUNITY_URL@"

style="Margin:0;color:#2199e8;font-family:Helvetica,Arial,sans-serif;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left;text-decoration:none">community.wildme.org</a>
].
style="Margin:0;color:#2199e8;font-family:Helvetica,Arial,sans-serif;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left;text-decoration:none">community.wildme.org</a>.
</p>
<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"

Expand Down