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

updates for page data getters being rewritten as data getters

Browse source
This commit is contained in:
hjkhjk54 2012-03-02 21:25:54 +00:00
parent ebfefce352
commit 42cab346e6
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
productMods/WEB-INF/ontologies/app/menu.n3
View file

@ -96,27 +96,27 @@ display:Research
#The data getter objects used above
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#peopleDataGetter>
a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
<http://vivoweb.org/ontology#vitroClassGrouppeople> .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#researchDataGetter>
a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
<http://vivoweb.org/ontology#vitroClassGrouppublications> .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#organizationsDataGetter>
a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
<http://vivoweb.org/ontology#vitroClassGrouporganizations> .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#eventsDataGetter>
a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>;
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
<http://vivoweb.org/ontology#vitroClassGroupevents> .
<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#homeDataGetter>
a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.BrowseDataGetter> .
a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> .
## display model pages ###

5
src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessInternalClasses.java
View file

@ -42,7 +42,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessIndividualsForClasses;
import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.InternalClassesDataGetter;
import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter;
/*
* Handle processing of data retrieved from IndividualsForClasses data getter to return to form template
@ -72,7 +73,7 @@ public class ProcessInternalClasses extends ProcessIndividualsForClasses {
return(internalClassSelected(vreq) || !allClassesSelected(vreq));
}
public Model processSubmission(VitroRequest vreq, Resource dataGetterResource) {
String dataGetterTypeUri = new InternalClassesDataGetter().getType();
String dataGetterTypeUri = DataGetterUtils.generateDataGetterTypeURI(InternalClassesDataGetter.class.getName());
String[] selectedClasses = vreq.getParameterValues("classInClassGroup");
Model dgModel = ModelFactory.createDefaultModel();
dgModel.add(dgModel.createStatement(dataGetterResource,

2
src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
View file

@ -43,7 +43,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessClassGroup;
import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.ProcessDataGetter;
import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.SelectDataGetterUtils;
import edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.*;
import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.*;
/*

2
themes/wilma/templates/identity.ftl
View file

@ -11,7 +11,7 @@
<ul id="header-nav" role="list">
<li role="listitem"><a href="${urls.index}" title="index">Index</a></li>
<#if user.loggedIn>
<#if (page??) && (page.URLToEditPage??) >
<#if (page??) && (page?is_hash || page?is_hash_ex) && (page.URLToEditPage??) >
<li role="listitem"><a href="${page.URLToEditPage}" title="edit page">Edit Page</a></li>
</#if>
<#if user.hasSiteAdminAccess>