From ee8300dccc9b8939b484dad17bcc66dda7008357 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Tue, 9 Dec 2014 13:16:20 -0500
Subject: [PATCH] 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.

---
 .../controller/freemarker/ListFauxPropertiesController.java  | 5 ++---
 .../body/siteAdmin/siteAdmin-fauxPropertiesList.ftl          | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
index f2303bfcb..409575826 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
@@ -118,7 +118,6 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
                     ObjectProperty op = opIt.next();
 					String baseURI = op.getURI();
                     fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI);
-
 					if ( fauxProps != null ) {
 						Iterator<FauxProperty> fpIt = fauxProps.iterator();
 						if ( !fpIt.hasNext()) {
@@ -152,7 +151,7 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 								tmpHash.put("domain", domainLabel);
 								tmpHash.put("domainURI", domainURI);
 								// 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("domainURI", domainURI);
 								// add the faux and its details to the treemap	
-								fauxForGivenBase.put(fauxLabel, tmpHash);
+								fauxForGivenBase.put(fauxLabel + "@@" + domainLabel, tmpHash);
 							}
 							 fauxByBaseProps.put(baseLabel, fauxForGivenBase);
 						} 
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
index 748197437..3f3260eb4 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
@@ -34,7 +34,7 @@
       <#assign ks = fauxProps[key] />
       <section id="classContainer1">
       <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>
       <table id="classHierarchy1" class="classHierarchy">
         <tbody>
@@ -76,7 +76,7 @@
           <tbody>
               <tr>
                 <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>
                 <td class="classDetail">${i18n().group_capitalized}:</td>