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

Adding null check to dump.ftl. Moving common vars to method in BrowseWidget NIHVIVO-1674

Browse source
This commit is contained in:
bdc34 2011-01-14 20:13:51 +00:00
parent f40a33062b
commit 9e273a9df6
2 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
View file

@ -83,8 +83,7 @@ public class BrowseWidget extends Widget {
VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
map.put("class", new VClassTemplateModel(vclass));
JSONObject vclassRes = JSONServlet.getLuceneIndividualsByVClass(vclass.getURI(), request, context);
map.put("vclass", JSONtoFmModel.convertJSONObjectToMap( (JSONObject) vclassRes.get("vclass") ));
JSONObject vclassRes = JSONServlet.getLuceneIndividualsByVClass(vclass.getURI(), request, context);
map.put("totalCount", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("totalCount") ));
map.put("alpha", JSONtoFmModel.convertJSONObjectToMap( (String) vclassRes.get("alpha") ));
map.put("individuals", JSONtoFmModel.convertJSONArrayToList( (JSONArray) vclassRes.get("individuals") ));
@ -97,7 +96,13 @@ public class BrowseWidget extends Widget {
private Map<String,Object> getCommonValues(Environment env, ServletContext context){
Map<String,Object> values = new HashMap<String,Object>();
values.putAll(FreemarkerHttpServlet.getDirectives());
try {
values.put("urls",env.getDataModel().get("urls"));
values.put("currentPage", env.getDataModel().get("currentPage"));
} catch (TemplateModelException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return values;
}
@ -106,14 +111,7 @@ public class BrowseWidget extends Widget {
Map<String,Object> body = new HashMap<String,Object>();
body.putAll(getCommonValues(env,context));
body.putAll(getAllClassGroupData(request, params, context));
try {
body.put("urls",env.getDataModel().get("urls"));
body.put("currentPage", env.getDataModel().get("currentPage"));
} catch (TemplateModelException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
String macroName = Mode.ALL_CLASS_GROUPS.macroName;
return new WidgetTemplateValues(macroName, body);
}
@ -145,14 +143,7 @@ public class BrowseWidget extends Widget {
Map<String,Object> body = new HashMap<String,Object>();
body.putAll(getCommonValues(env,context));
body.putAll(getClassData(request,params,context));
try {
body.put("urls",env.getDataModel().get("urls"));
body.put("currentPage", env.getDataModel().get("currentPage"));
} catch (TemplateModelException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
String macroName = Mode.VCLASS.macroName;
return new WidgetTemplateValues(macroName, body);
}
@ -184,14 +175,7 @@ public class BrowseWidget extends Widget {
Map<String,Object> body = new HashMap<String,Object>();
body.putAll(getCommonValues(env,context));
body.putAll( getClassGroupData(request,params, context));
try {
body.put("urls",env.getDataModel().get("urls"));
body.put("currentPage", env.getDataModel().get("currentPage"));
} catch (TemplateModelException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
String macroName = Mode.CLASS_GROUP.macroName;
return new WidgetTemplateValues(macroName, body);
}

4
webapp/web/templates/freemarker/body/partials/dump/dump.ftl
View file

@ -8,4 +8,6 @@
${var}
</div>
${stylesheets.add("/css/dump.css")}
<#if stylesheets??>
${stylesheets.add("/css/dump.css")}
</#if>