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

No Jira issue. Faux property listing was not displaying all cases of a property where the labels were the same but the domains were different.

Browse source
This commit is contained in:
Tim Worrall 2014-12-09 13:16:20 -05:00
parent 875ba66a46
commit ee8300dccc
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
View file

@ -118,7 +118,6 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
ObjectProperty op = opIt.next(); ObjectProperty op = opIt.next();
String baseURI = op.getURI(); String baseURI = op.getURI();
fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI); fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI);
if ( fauxProps != null ) { if ( fauxProps != null ) {
Iterator<FauxProperty> fpIt = fauxProps.iterator(); Iterator<FauxProperty> fpIt = fauxProps.iterator();
if ( !fpIt.hasNext()) { if ( !fpIt.hasNext()) {
@ -152,7 +151,7 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
tmpHash.put("domain", domainLabel); tmpHash.put("domain", domainLabel);
tmpHash.put("domainURI", domainURI); tmpHash.put("domainURI", domainURI);
// add the faux and its details to the treemap // add the faux and its details to the treemap
theFauxProps.put(fauxLabel, tmpHash); theFauxProps.put(fauxLabel + "@@" + domainLabel, tmpHash);
} }
} }
} }
@ -208,7 +207,7 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
tmpHash.put("domain", domainLabel); tmpHash.put("domain", domainLabel);
tmpHash.put("domainURI", domainURI); tmpHash.put("domainURI", domainURI);
// add the faux and its details to the treemap // add the faux and its details to the treemap
fauxForGivenBase.put(fauxLabel, tmpHash); fauxForGivenBase.put(fauxLabel + "@@" + domainLabel, tmpHash);
} }
fauxByBaseProps.put(baseLabel, fauxForGivenBase); fauxByBaseProps.put(baseLabel, fauxForGivenBase);
} }

4
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
View file

@ -34,7 +34,7 @@
<#assign ks = fauxProps[key] /> <#assign ks = fauxProps[key] />
<section id="classContainer1"> <section id="classContainer1">
<div> <div>
<a href='editForm?controller=FauxProperty&baseUri=${ks["baseURI"]?url!}&<#if ks["domainURI"]?has_content>domainUri=${ks["domainURI"]?url}&</#if>rangeUri=${ks["rangeURI"]?url!}'>${key}</a> <a href='editForm?controller=FauxProperty&baseUri=${ks["baseURI"]?url!}&<#if ks["domainURI"]?has_content>domainUri=${ks["domainURI"]?url}&</#if>rangeUri=${ks["rangeURI"]?url!}'>${key?substring(0,key?index_of("@@"))}</a>
</div> </div>
<table id="classHierarchy1" class="classHierarchy"> <table id="classHierarchy1" class="classHierarchy">
<tbody> <tbody>
@ -76,7 +76,7 @@
<tbody> <tbody>
<tr> <tr>
<td class="classDetail">${i18n().faux_property_capitalized}:</td> <td class="classDetail">${i18n().faux_property_capitalized}:</td>
<td><a href='editForm?controller=FauxProperty&baseUri=${faux["baseURI"]?url!}&<#if faux["domainURI"]?has_content>domainUri=${faux["domainURI"]?url}&</#if>rangeUri=${faux["rangeURI"]?url!}'>${k2}</a></td> <td><a href='editForm?controller=FauxProperty&baseUri=${faux["baseURI"]?url!}&<#if faux["domainURI"]?has_content>domainUri=${faux["domainURI"]?url}&</#if>rangeUri=${faux["rangeURI"]?url!}'>${k2?substring(0,k2?index_of("@@"))}</a></td>
</tr> </tr>
<tr> <tr>
<td class="classDetail">${i18n().group_capitalized}:</td> <td class="classDetail">${i18n().group_capitalized}:</td>