litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update view labels servlet to use current language filtering

Browse source
This commit is contained in:
Brian Lowe 2021-05-28 17:12:02 +03:00
parent c07af3d794
commit 63639fc852
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java
View file

@ -188,8 +188,8 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
ArrayList<Literal> labels = new ArrayList<Literal>(); ArrayList<Literal> labels = new ArrayList<Literal>();
try { try {
//We want to get the labels for all the languages, not just the display language // Show only labels with current language filtering
ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq); ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
while (results.hasNext()) { while (results.hasNext()) {
QuerySolution soln = results.nextSolution(); QuerySolution soln = results.nextSolution();
Literal nodeLiteral = soln.get("label").asLiteral(); Literal nodeLiteral = soln.get("label").asLiteral();

5
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java
View file

@ -373,8 +373,9 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
ArrayList<Literal> labels = new ArrayList<Literal>(); ArrayList<Literal> labels = new ArrayList<Literal>();
try { try {
//We want to get the labels for all the languages, not just the display language // Get results filtered to current locale so as to be consistent
ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq); // with other editing forms.
ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
while (results.hasNext()) { while (results.hasNext()) {
QuerySolution soln = results.nextSolution(); QuerySolution soln = results.nextSolution();
Literal nodeLiteral = soln.get("label").asLiteral(); Literal nodeLiteral = soln.get("label").asLiteral();

6
webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
View file

@ -307,17 +307,23 @@ name will be used as the label. -->
<#assign linkTitle = "${i18n().manage_list_of_labels}"> <#assign linkTitle = "${i18n().manage_list_of_labels}">
<#assign labelLink= "${urls.base}/editRequestDispatch?subjectUri=${individualUri}&editForm=${generators.ManageLabelsGenerator}&predicateUri=${labelPropertyUri}${extraParameters}"> <#assign labelLink= "${urls.base}/editRequestDispatch?subjectUri=${individualUri}&editForm=${generators.ManageLabelsGenerator}&predicateUri=${labelPropertyUri}${extraParameters}">
<#else> <#else>
<#-- For consistency of behavior, don't show view labels link to users without editing privileges .
<#assign linkTitle = "${i18n().view_list_of_labels}"> <#assign linkTitle = "${i18n().view_list_of_labels}">
<#assign imageAlt = "${i18n().view}" /> <#assign imageAlt = "${i18n().view}" />
<#assign labelLink= "${urls.base}/viewLabels?subjectUri=${individualUri}${extraParameters}"> <#assign labelLink= "${urls.base}/viewLabels?subjectUri=${individualUri}${extraParameters}">
-->
</#if> </#if>
<#if editable>
<#-- Render the link only if editable. See comment above. -->
<span class="inline"> <span class="inline">
<a class="add-label" href="${labelLink}" <a class="add-label" href="${labelLink}"
title="${linkTitle}"> title="${linkTitle}">
<img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${imageAlt}" /></a> <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${imageAlt}" /></a>
</span> </span>
</#if> </#if>
</#if>
</#macro> </#macro>
<#-- Most specific types --> <#-- Most specific types -->