From 4fa16f31acc11b81802a462cd0a06b32698bb761 Mon Sep 17 00:00:00 2001 From: hjkhjk54 Date: Fri, 22 Jul 2011 19:53:18 +0000 Subject: [PATCH] Updates for both NIHVIVO-3039 and NIHVIVO-3038 --- .../vitro/webapp/utils/pageDataGetter/DataGetterUtils.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java index 6dda38681..c09e82253 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java @@ -118,6 +118,8 @@ public class DataGetterUtils { //TODO: Check if can include by type here IndividualsForClassesDataGetter cidg = new IndividualsForClassesDataGetter(); getPageDataGetterMap(context).put(cidg.getType(), cidg); + InternalClassesDataGetter internalCdg = new InternalClassesDataGetter(); + getPageDataGetterMap(context).put(internalCdg.getType(), internalCdg); } } @@ -215,11 +217,12 @@ public class DataGetterUtils { new JSONObject().put("URI",vclass.getURI()) .put("name",vclass.getName())); } else { - //For now, utilize very first first VClass (assume that that is the one to be employed) + //For now, utilize very last VClass (assume that that is the one to be employed) //TODO: Find more general way of dealing with this //put multiple ones in? if(vclassIds.size() > 0) { - vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassIds.get(0)); + int numberVClasses = vclassIds.size(); + vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassIds.get(numberVClasses - 1)); rObj.put("vclass", new JSONObject().put("URI",vclass.getURI()) .put("name",vclass.getName())); }