NIHVIVO-2186 Filter out incomplete object property statements for non-editing users.

webapp/web/config/listViewConfig-default.xml

@@ -13,12 +13,16 @@
           
         SELECT <collated> ?subclass </collated>
                ?object ?name ?moniker WHERE {
+               
             ?subject ?property ?object
             <collated> OPTIONAL { ?object a ?subclass } 
             FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )   
             </collated>
             OPTIONAL { ?object rdfs:label ?name }
-            OPTIONAL { ?object vitro:moniker ?moniker }               
+            OPTIONAL { ?object vitro:moniker ?moniker }      
+            <linked-individual-required>
+            FILTER ( bound(?name) )
+            </linked-individual-required>
         } ORDER BY <collated> ?subclass </collated> ?name ?object  
     </query-select>
 

webapp/web/config/listViewConfig-vitroLink.xml

@@ -18,6 +18,9 @@
             OPTIONAL { ?link vitro:linkAnchor ?anchor }
             OPTIONAL { ?link vitro:linkURL ?url }
             OPTIONAL { ?link vitro:linkDisplayRank ?rank }
+        <linked-individual-required>
+        FILTER ( bound(?anchor) &amp;&amp; bound(?url) )    
+        </linked-individual-required>
         } ORDER BY ?rank
     </query-select>
 

webapp/web/templates/freemarker/body/partials/individual/propStatement-vitroLink.ftl

@@ -11,5 +11,5 @@
 <#if statement.url??>
     <a href="${statement.url}">${linkText}</a> 
 <#else>
-    <a href="${profileUrl(statement.link)}">${linkText}</a> (no url provided for link)    
+    ${linkText} (no url provided for link)    
 </#if>

webapp/web/templates/freemarker/body/test.ftl

@@ -3,6 +3,3 @@
 <#-- FreeMarker test cases -->
 
 <h2>${title}</h2>
-
-
-