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

updates to enable page list to return correctly (previous pageUri parameter was being bound after sparql query updated to enable parameter binding to query)

Browse source
This commit is contained in:
hjkhjk54 2012-06-22 14:55:29 +00:00
parent 56d23c8e2c
commit 67f5517d90
3 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
webapp/web/WEB-INF/ontologies/app/menu.n3
View file

@ -50,12 +50,20 @@ display:pageListData
display:query """
PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
SELECT ?pageUri ?title ?urlMapping ?template ?menuItem
SELECT ?listedPageUri ?listedPageTitle ?listedPageUrlMapping ?listedPageTemplate ?listedPageMenuItem
WHERE {
?pageUri a display:Page .
OPTIONAL{ ?pageUri display:urlMapping ?urlMapping. }
OPTIONAL{ ?pageUri display:title ?title. }
OPTIONAL {?pageUri display:requiresBodyTemplate ?template .}
OPTIONAL {?menuItem display:toPage ?pageUri .}
?listedPageUri a display:Page .
OPTIONAL{ ?listedPageUri display:urlMapping ?listedPageUrlMapping. }
OPTIONAL{ ?listedPageUri display:title ?listedPageTitle. }
OPTIONAL {?listedPageUri display:requiresBodyTemplate ?listedPageTemplate .}
OPTIONAL {?listedPageMenuItem display:toPage ?listedPageUri .}
} """ .
###Page Management and Data Getters
#Data getter type labels
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData> rdfs:label "Class Group Page" .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> rdfs:label "Browse Page" .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter> rdfs:label "Class Group Page - Selected Classes" .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter> rdfs:label "Sparql Query Results" .

2
webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3
View file

@ -203,5 +203,3 @@ rdf:type
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#restrictResultsByClass>
a owl:ObjectProperty .

12
webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
View file

@ -24,20 +24,20 @@
<#list pages as pagex>
<tr>
<td>
<#if pagex.pageUri?has_content>
<a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1">${(pagex.title)!'-untitled-'}</a>
<#if pagex.listedPageUri?has_content>
<a href="${urls.base}/individual?uri=${pagex.listedPageUri?url}&switchToDisplayModel=1">${(pagex.listedPageTitle)!'-untitled-'}</a>
&nbsp;
<a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.pageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator">Edit</a>
<a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator">Edit</a>
<#else>
No URI defined for page.
</#if>
</td>
<!--td> {pagex.dataGetterLabel}</td-->
<td>${pagex.urlMapping}</td>
<td>${(pagex.template)!''}</td>
<td>${pagex.listedPageUrlMapping}</td>
<td>${(pagex.listedPageTemplate)!''}</td>
<td style="text-align:center">
<#if pagex.menuItem?has_content>
<#if pagex.listedPageMenuItem?has_content>
<div class="menuFlag"></div>
</#if>
</td>