LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Formatierung... 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1728 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2012-06-27 12:14:59 +00:00
parent 2bfd5df4b9
commit db6a3eabf8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-navigation/src/com/arsdigita/navigation/cms/CMSDataCollectionRenderer.java
View File

@ -61,7 +61,7 @@ public class CMSDataCollectionRenderer extends DataCollectionRenderer {
DataObject dobj,
ACSObject obj,
int index) {
if (obj != null) {
if (obj != null) {
ContentItemXMLRenderer renderer = new ContentItemXMLRenderer(item);
renderer.setRevisitFullObject(false);
renderer.setWrapAttributes(true);
@ -74,7 +74,7 @@ public class CMSDataCollectionRenderer extends DataCollectionRenderer {
* possible to set the adapter context used from a JSP template,
* using DataCollectionRenderer#setSpecializeObjectsContext(String).
*/
renderer.walk(obj, getSpecializeObjectsContext());
renderer.walk(obj, getSpecializeObjectsContext());
if ((obj instanceof ContentItem) && useExtraXml) {
final ContentItem contentItem = (ContentItem) obj;
@ -84,7 +84,7 @@ public class CMSDataCollectionRenderer extends DataCollectionRenderer {
generator.generateXML(contentItem, item, null);
}
}
}
}
}
}

5
ccm-navigation/src/com/arsdigita/navigation/ui/object/ComplexObjectList.java
View File

@ -53,7 +53,6 @@ public class ComplexObjectList extends AbstractObjectList {
* Hinzufügen eines SQL-Filter zur Abfrage
* Verarbeitet einen boolschen Filter, der SQL-konform Formatiert ist.
* Siehe PostgreSQL-Handbuch zur where-Klausel
(??)
* @param sqlfilter
*/
public void setSQLFilter(String sqlfilter) {
@ -76,12 +75,12 @@ public class ComplexObjectList extends AbstractObjectList {
m_customAttributes.put(attribute, value);
}
/*
/* Diese Methode überschreibt die Methode aus der Eltern-Klasse, um
* die SQL-Filter berücksichtigen zu können
*/
@Override
protected DataCollection getObjects(HttpServletRequest request,
HttpServletResponse response) {
HttpServletResponse response) {
DataCollection objects = super.getObjects(request, response);
// Don't try do anything with a null object