BugFixes für Zuordnung Reihe zu Publikationen
git-svn-id: https://svn.libreccm.org/ccm/trunk@2442 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
2dbb575b90
commit
92498b46c9
|
|
@ -260,7 +260,7 @@ public class Publication extends ContentPage {
|
|||
return getPublicationBundle().getSeries();
|
||||
}
|
||||
|
||||
public void addSeries(final Series series, final Integer volumeOfSeries) {
|
||||
public void addSeries(final Series series, final String volumeOfSeries) {
|
||||
//Assert.exists(series, Series.class);
|
||||
|
||||
//add(SERIES, series);
|
||||
|
|
|
|||
|
|
@ -357,7 +357,7 @@ public class PublicationBundle extends ContentBundle {
|
|||
return new SeriesCollection((DataCollection) get(SERIES));
|
||||
}
|
||||
|
||||
public void addSeries(final Series series, final Integer volumeOfSeries) {
|
||||
public void addSeries(final Series series, final String volumeOfSeries) {
|
||||
Assert.exists(series, Series.class);
|
||||
|
||||
final DataObject link = add(SERIES, series.getSeriesBundle());
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import com.arsdigita.bebop.event.FormInitListener;
|
|||
import com.arsdigita.bebop.event.FormProcessListener;
|
||||
import com.arsdigita.bebop.event.FormSectionEvent;
|
||||
import com.arsdigita.bebop.form.TextField;
|
||||
import com.arsdigita.bebop.parameters.IntegerParameter;
|
||||
import com.arsdigita.bebop.parameters.StringParameter;
|
||||
import com.arsdigita.bebop.parameters.ParameterModel;
|
||||
import com.arsdigita.cms.ContentType;
|
||||
import com.arsdigita.cms.Folder;
|
||||
|
|
@ -84,7 +84,7 @@ public class PublicationSeriesAddForm
|
|||
|
||||
add(new Label((String) PublicationGlobalizationUtil.globalize(
|
||||
"publications.ui.series.volume_of_series").localize()));
|
||||
ParameterModel volumeOfSeriesParam = new IntegerParameter(
|
||||
ParameterModel volumeOfSeriesParam = new StringParameter(
|
||||
VolumeInSeriesCollection.VOLUME_OF_SERIES);
|
||||
volumeOfSeries = new TextField(volumeOfSeriesParam);
|
||||
add(volumeOfSeries);
|
||||
|
|
@ -111,7 +111,7 @@ public class PublicationSeriesAddForm
|
|||
series = (Series) series.getContentBundle().getInstance(publication.
|
||||
getLanguage());
|
||||
|
||||
publication.addSeries(series, (Integer) data.get(VolumeInSeriesCollection.VOLUME_OF_SERIES));
|
||||
publication.addSeries(series, (String) data.get(VolumeInSeriesCollection.VOLUME_OF_SERIES));
|
||||
m_itemSearch.publishCreatedItem(data, series);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -615,7 +615,7 @@ public class ImporterUtil {
|
|||
bundle.setContentSection(folder.getContentSection());
|
||||
bundle.save();
|
||||
|
||||
publication.addSeries(series, 1);
|
||||
publication.addSeries(series, "1");
|
||||
|
||||
if (publish) {
|
||||
publishItem(series);
|
||||
|
|
@ -633,7 +633,7 @@ public class ImporterUtil {
|
|||
if (!pretend) {
|
||||
collection.next();
|
||||
final Series series = new Series(collection.getDataObject());
|
||||
publication.addSeries(series, 1);
|
||||
publication.addSeries(series, "1");
|
||||
}
|
||||
report.setCreated(false);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue