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

Provide access to the complete set of properties in FreeMarker templates, by putting a fullPropertyList in BaseIndividualTemplateModel. This is done by bypassing filtering.

Browse source 
Individual.java: proved getBaseIndividual() method.
This commit is contained in:
mbarbier 2011-03-31 16:07:14 +00:00
parent 09af317822
commit defae26bf1
4 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java
View file

@ -165,4 +165,6 @@ public interface Individual extends ResourceBean, VitroTimeWindowedResource, Com
Float getSearchBoost();
void setSearchBoost( Float boost );
Individual getBaseIndividual();
}

5
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
View file

@ -505,4 +505,9 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
public boolean hasThumb() {
return getThumbUrl() != null && ! getThumbUrl().isEmpty();
}
@Override
public Individual getBaseIndividual() {
return this;
}
}

6
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
View file

@ -652,4 +652,10 @@ public class IndividualFiltering implements Individual {
public boolean hasThumb() {
return _innerIndividual.hasThumb();
}
@Override
public Individual getBaseIndividual() {
return _innerIndividual.getBaseIndividual();
}
}

7
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
View file

@ -29,6 +29,7 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
protected VitroRequest vreq;
protected UrlBuilder urlBuilder;
protected GroupedPropertyList propertyList = null;
protected GroupedPropertyList fullPropertyList = null;
protected LoginStatusBean loginStatusBean = null;
private EditingPolicyHelper policyHelper = null;
@ -113,6 +114,12 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
}
return propertyList;
}
public GroupedPropertyList getFullPropertyList() {
if (fullPropertyList == null) {
fullPropertyList = new GroupedPropertyList(individual.getBaseIndividual(), vreq, policyHelper); //get individual without filtering
}
return fullPropertyList;
}
public boolean isEditable() {
// RY This will be improved later. What is important is not whether the user is a self-editor,