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

CT Image 

* Suche funktioniert nun
 * Problem mit dem Event-Handler behoben

Damit sollten nun alle Punkte für diesen CT erledigt sein.

git-svn-id: https://svn.libreccm.org/ccm/trunk@918 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2011-05-17 18:19:49 +00:00
parent 3b3ec66061
commit 3c7fbe8a07
5 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-cms-types-image/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml
View File

@ -13,4 +13,16 @@
</xrd:associations> </xrd:associations>
</xrd:adapter> </xrd:adapter>
</xrd:context> </xrd:context>
<xrd:context name="com.arsdigita.cms.search.ContentPageMetadataProvider">
<xrd:adapter objectType="com.arsdigita.cms.contenttypes.Image" extends="com.arsdigita.cms.ContentItem" traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
<xrd:attributes rule="exclude">
<xrd:property name="/object/image"/>
<xrd:property name="/object/thumbnail"/>
</xrd:attributes>
<xrd:associations rule="include">
<xrd:property name="/object/textAsset"/>
</xrd:associations>
</xrd:adapter>
</xrd:context>
</xrd:adapters> </xrd:adapters>

13
ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/Image.java
View File

@ -30,9 +30,9 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* This content type represents an article. *
* *
* @version $Revision: #6 $ $Date: 2004/08/17 $ * @author Sören Bernstein
*/ */
public class Image extends ContentPage { public class Image extends ContentPage {
@ -97,6 +97,15 @@ public class Image extends ContentPage {
super(type); super(type);
} }
/**
* @return the base PDL object type for this item. Child classes should
* override this method to return the correct value
*/
@Override
public String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
public ImageAsset getImage() { public ImageAsset getImage() {
DataObject dobj = (DataObject) get(IMAGE); DataObject dobj = (DataObject) get(IMAGE);
if (dobj != null) { if (dobj != null) {

11
ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java
View File

@ -18,7 +18,6 @@
*/ */
package com.arsdigita.cms.contenttypes; package com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentPage;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -34,10 +33,18 @@ public class ImageInitializer extends ContentTypeInitializer {
private static final Logger s_log = Logger.getLogger(ImageInitializer.class); private static final Logger s_log = Logger.getLogger(ImageInitializer.class);
public ImageInitializer() { public ImageInitializer() {
super("ccm-cms-types-image.pdl.mf", ContentPage.BASE_DATA_OBJECT_TYPE); super("ccm-cms-types-image.pdl.mf", Image.BASE_DATA_OBJECT_TYPE);
} }
@Override
public String getTraversalXML() { public String getTraversalXML() {
return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml"; return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml";
} }
@Override
public String[] getStylesheets() {
return new String[] {
"/static/content-types/com/arsdigita/cms/contenttypes/Image.xsl" };
}
} }

1
ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertiesStep.java
View File

@ -221,7 +221,6 @@ public class ImagePropertiesStep extends SimpleEditStep {
if (image != null && uploadSheet.getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) { if (image != null && uploadSheet.getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) {
image.setImage(imageAsset); image.setImage(imageAsset);
image.save();
} }
} }

2
ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertyForm.java
View File

@ -244,7 +244,7 @@ public class ImagePropertyForm
image.setOrigin((String) data.get(Image.ORIGIN)); image.setOrigin((String) data.get(Image.ORIGIN));
image.setOriginalSize((String) data.get(Image.ORIGSIZE)); image.setOriginalSize((String) data.get(Image.ORIGSIZE));
image.save(); m_step.cancelStreamlinedCreation(fse.getPageState());
} }
} }
} }