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

Merge r7827 from nihvivo-rel-1.2-maint branch: fix display of classgroups with no public name on index and home pages.

Browse source
This commit is contained in:
ryounes 2011-04-19 16:33:21 +00:00
parent 78c3294102
commit 1e03e2b5a8
5 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java
View file

@ -174,7 +174,6 @@ public class BrowseDataGetter implements PageDataGetter {
map.put("classes", classes);
map.put("classGroup", new VClassGroupTemplateModel(vcg));
map.put("classGroupName", vcg.getPublicName());
map.put("classGroupUri", vcg.getURI());
return map;

11
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java
View file

@ -3,9 +3,9 @@
package edu.cornell.mannlib.vitro.webapp.web.templatemodels;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -43,6 +43,15 @@ public class VClassGroupTemplateModel extends BaseTemplateModel {
return vClassGroup.getPublicName();
}
// Protect the template against a group without a name.
public String getDisplayName() {
String displayName = getPublicName();
if (StringUtils.isBlank(displayName)) {
displayName = getLocalName().replaceFirst("vitroClassGroup", "");
}
return displayName;
}
public List<VClassTemplateModel> getClasses() {
if (classes == null) {
List<VClass> classList = vClassGroup.getVitroClassList();