From a844c31d11d50e1d92fda279538af3dddabb25f2 Mon Sep 17 00:00:00 2001 From: baka Date: Wed, 10 May 2017 15:44:56 +0000 Subject: [PATCH] Ticket #2683 - Missed something. git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4724 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms/src/main/java/org/librecms/Cms.java | 1 + ccm-cms/src/main/java/org/librecms/assets/Image.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ccm-cms/src/main/java/org/librecms/Cms.java b/ccm-cms/src/main/java/org/librecms/Cms.java index aff604c98..334532fe2 100644 --- a/ccm-cms/src/main/java/org/librecms/Cms.java +++ b/ccm-cms/src/main/java/org/librecms/Cms.java @@ -66,6 +66,7 @@ import java.util.Properties; ExternalVideoAsset.class, ExternalAudioAsset.class, FileAsset.class, + Image.class, LegalMetadata.class, SideNote.class}) public class Cms implements CcmModule { diff --git a/ccm-cms/src/main/java/org/librecms/assets/Image.java b/ccm-cms/src/main/java/org/librecms/assets/Image.java index db9637637..2a6e6f905 100644 --- a/ccm-cms/src/main/java/org/librecms/assets/Image.java +++ b/ccm-cms/src/main/java/org/librecms/assets/Image.java @@ -26,11 +26,13 @@ import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.Table; +import com.arsdigita.cms.ui.assets.forms.ImageForm; import org.hibernate.envers.Audited; import javax.persistence.OneToOne; import static org.librecms.CmsConstants.*; +import static org.librecms.assets.AssetConstants.*; /** * An asset for images (in a format which can be displayed by a browser, like @@ -41,6 +43,11 @@ import static org.librecms.CmsConstants.*; @Entity @Table(name = "IMAGES", schema = DB_SCHEMA) @Audited +@AssetType(assetForm = ImageForm.class, + labelKey = "image.label", + labelBundle = ASSETS_BUNDLE, + descriptionKey = "image.description", + descriptionBundle = ASSETS_BUNDLE) public class Image extends BinaryAsset implements Serializable { private static final long serialVersionUID = -8095106228017573785L;