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

Removed method to return moniker or vclass, now unnecessary after corrections to IndividualJena.getMoniker() in r5103.

Browse source
This commit is contained in:
rjy7 2010-07-04 17:39:50 +00:00
parent c92f69134c
commit 29544748e3
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/IndividualTemplateModel.java
View file

@ -28,10 +28,12 @@ public class IndividualTemplateModel extends BaseTemplateModel {
} }
/* These methods perform some manipulation of the data returned by the Individual methods */ /* These methods perform some manipulation of the data returned by the Individual methods */
public String getTagline() { // RY Individiual.getMoniker() was already trying to do this, but due to errors in the code it was not.
String tagline = individual.getMoniker(); // That's fixed now.
return StringUtils.isEmpty(tagline) ? individual.getVClass().getName() : tagline; // public String getTagline() {
} // String tagline = individual.getMoniker();
// return StringUtils.isEmpty(tagline) ? individual.getVClass().getName() : tagline;
// }
// Return link to individual's profile page. // Return link to individual's profile page.
// There may be other urls associated with the individual. E.g., we might need // There may be other urls associated with the individual. E.g., we might need
@ -89,6 +91,10 @@ public class IndividualTemplateModel extends BaseTemplateModel {
return individual.getName(); return individual.getName();
} }
public String getMoniker() {
return individual.getMoniker();
}
public String getUri() { public String getUri() {
return individual.getURI(); return individual.getURI();
} }

2
webapp/web/templates/freemarker/body/partials/class/view/search/default.ftl
View file

@ -7,7 +7,7 @@
<a href="${individual.profileUrl}">${individual.name}</a> <a href="${individual.profileUrl}">${individual.name}</a>
<ul class="individualData"> <ul class="individualData">
<@l.firstLastList> <@l.firstLastList>
<li>${individual.tagline}</li>, <li>${individual.moniker}</li>,
<#list individual.links as link> <#list individual.links as link>
<li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>, <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>,
</#list> </#list>