diff --git a/ccm-cms-assets-imagestep/application.xml b/ccm-cms-assets-imagestep/application.xml index 934b0cc34..6e899da27 100755 --- a/ccm-cms-assets-imagestep/application.xml +++ b/ccm-cms-assets-imagestep/application.xml @@ -2,7 +2,7 @@ diff --git a/ccm-cms-assets-imagestep/pdl/com/arsdigita/cms/contentassets/ItemImageAttachment.pdl b/ccm-cms-assets-imagestep/pdl/com/arsdigita/cms/contentassets/ItemImageAttachment.pdl index 4f7b4c643..ba233111e 100755 --- a/ccm-cms-assets-imagestep/pdl/com/arsdigita/cms/contentassets/ItemImageAttachment.pdl +++ b/ccm-cms-assets-imagestep/pdl/com/arsdigita/cms/contentassets/ItemImageAttachment.pdl @@ -10,6 +10,9 @@ object type ItemImageAttachment extends ACSObject { String[0..1] caption = cms_item_image_attachment.caption VARCHAR( 100 ); String[0..1] title = cms_item_image_attachment.title VARCHAR( 200 ); String[0..1] description = cms_item_image_attachment.description VARCHAR( 4000 ); + + BigDecimal[0..1] sortKey = cms_item_image_attachment.sort_key INTEGER; + component Link[0..1] imageLink = join cms_item_image_attachment.link_id to cms_links.link_id; composite ReusableImageAsset[0..1] image diff --git a/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.1-6.6.2.sql new file mode 100644 index 000000000..81b7da220 --- /dev/null +++ b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/upgrade/postgres-6.6.1-6.6.2.sql @@ -0,0 +1,7 @@ +\echo ImageStep 6.6.1 -> 6.6.2 Upgrade Script (PostgreSQL) + +begin; + +\i ../default/upgrade/6.6.1-6.6.2/cms_item_image_attachment.sql + +commit; diff --git a/ccm-cms-assets-imagestep/src/ccm-cms-assets-imagestep.upgrade b/ccm-cms-assets-imagestep/src/ccm-cms-assets-imagestep.upgrade index f1e2ffaa8..f3b0ada97 100755 --- a/ccm-cms-assets-imagestep/src/ccm-cms-assets-imagestep.upgrade +++ b/ccm-cms-assets-imagestep/src/ccm-cms-assets-imagestep.upgrade @@ -11,4 +11,7 @@