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

Feld für Band der Reihe ist jetzt alphanumerisch (Upgradeskript enthalten) (Ticket #1559) 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2156 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-05-29 18:15:58 +00:00
parent ef794424de
commit c3ade037a9
7 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl
View File

@ -73,5 +73,5 @@ association {
join ct_publications_volume_in_series.publication_id join ct_publications_volume_in_series.publication_id
to ct_publication_bundles.bundle_id; to ct_publication_bundles.bundle_id;
// Additional attributes // Additional attributes
Integer[0..1] volumeOfSeries = ct_publications_volume_in_series.volumeOfSeries INTEGER; String[0..1] volumeOfSeries = ct_publications_volume_in_series.volumeOfSeries VARCHAR(128);
} }

2
ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.4-6.6.5/vol_of_series_alphanum.sql 100644
View File

@ -0,0 +1,2 @@
-- Make volume_of_series alpha numerical
ALTER TABLE ct_publications_volume_in_series ALTER COLUMN volumeofseries TYPE VARCHAR(128);

8
ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.4-6.6.5.sql 100644
View File

@ -0,0 +1,8 @@
\echo 'ScientificCMS Publications module 6.6.4 -> 6.6.5 Upgrade script (PostgreSQL)'
begin;
\i ../default/upgrade/6.6.4-6.6.5/vol_of_series_alphanum.sql
end;

4
ccm-sci-publications/src/ccm-sci-publications.upgrade
View File

@ -11,4 +11,8 @@
<version from="6.6.3" to="6.6.4"> <version from="6.6.3" to="6.6.4">
<script sql="ccm-sci-publications/upgrade/::database::-6.6.3-6.6.4.sql" /> <script sql="ccm-sci-publications/upgrade/::database::-6.6.3-6.6.4.sql" />
</version> </version>
<!-- Upgrade to version 6.6.5, included in ScientificCMS 2.1.0 -->
<version from="6.6.4" to="6.6.5">
<script sql="ccm-sci-publications/upgrade/::database::-6.6.4-6.6.5.sql" />
</version>
</upgrade> </upgrade>

2
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Series.java
View File

@ -108,7 +108,7 @@ public class Series extends ContentPage {
return getSeriesBundle().getVolumes(); return getSeriesBundle().getVolumes();
} }
public void addVolume(final Publication publication, final Integer volume) { public void addVolume(final Publication publication, final String volume) {
getSeriesBundle().addVolume(publication, volume); getSeriesBundle().addVolume(publication, volume);
} }

2
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java
View File

@ -242,7 +242,7 @@ public class SeriesBundle extends ContentBundle {
} }
public void addVolume(final Publication publication, public void addVolume(final Publication publication,
final Integer volume) { final String volume) {
Assert.exists(publication, Publication.class); Assert.exists(publication, Publication.class);
DataObject link = add(PUBLICATIONS, publication.getPublicationBundle()); DataObject link = add(PUBLICATIONS, publication.getPublicationBundle());

6
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesCollection.java
View File

@ -39,11 +39,11 @@ public class SeriesCollection extends DomainCollection {
super(dataCollection); super(dataCollection);
} }
public Integer getVolumeOfSeries() { public String getVolumeOfSeries() {
return (Integer) m_dataCollection.get(LINK_VOLUME_OF_SERIES); return (String) m_dataCollection.get(LINK_VOLUME_OF_SERIES);
} }
public void setVolumeOfSeries(Integer volumeOfSeries) { public void setVolumeOfSeries(String volumeOfSeries) {
DataObject link = (DataObject) this.get("link"); DataObject link = (DataObject) this.get("link");
link.set(VOLUME_OF_SERIES, volumeOfSeries); link.set(VOLUME_OF_SERIES, volumeOfSeries);