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

Weitere Korrekturen für Publizierenprozess 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1576 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-04-10 09:41:29 +00:00
parent 9d5c4cd3f9
commit ced5ee10c2
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ccm-cms/src/com/arsdigita/cms/ContentItem.java
View File

@ -1965,9 +1965,8 @@ public class ContentItem extends VersionedACSObject implements CustomCopy {
if (obj instanceof ContentItem) {
final ContentItem item = (ContentItem) obj;
return item.copyReverseProperty(source,
item,
property,
this,
property,
copier);
}
}

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

@ -306,7 +306,8 @@ public class PublicationBundle extends ContentBundle {
final GenericOrganizationalUnitBundle orgaunitBundle = orgaunit.
getGenericOrganizationalUnitBundle();
orgaunitBundle.add(ORGAUNIT_PUBLICATIONS, publication);
orgaunitBundle.add(ORGAUNIT_PUBLICATIONS,
publication.getPublicationBundle());
}
public static void removePublication(
@ -317,7 +318,8 @@ public class PublicationBundle extends ContentBundle {
final GenericOrganizationalUnitBundle orgaunitBundle = orgaunit.
getGenericOrganizationalUnitBundle();
orgaunitBundle.remove(ORGAUNIT_PUBLICATIONS, publication);
orgaunitBundle.remove(ORGAUNIT_PUBLICATIONS,
publication.getPublicationBundle());
}
public SeriesCollection getSeries() {

30
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
View File

@ -26,8 +26,9 @@ import java.math.BigDecimal;
/**
*
* @author Jens Pelzetter
* @version $Id$
* @author Jens Pelzetter
* @version $Id: GenericOrganizationalUnitPublicationsTable.java 1569 2012-04-05
* 14:10:12Z jensp $
*/
public class GenericOrganizationalUnitPublicationsTable
extends Table {
@ -49,12 +50,14 @@ public class GenericOrganizationalUnitPublicationsTable
columnModel.add(new TableColumn(
0,
PublicationGlobalizationUtil.globalize(
"genericorganizationalunit.ui.publications.columns.name").localize(),
"genericorganizationalunit.ui.publications.columns.name").
localize(),
TABLE_COL_EDIT));
columnModel.add(new TableColumn(
1,
PublicationGlobalizationUtil.globalize(
"genericorganizationalunit.ui.publications.columns.remove").localize(),
"genericorganizationalunit.ui.publications.columns.remove").
localize(),
TABLE_COL_DEL));
setModelBuilder(new ModelBuilder(itemModel));
@ -160,20 +163,15 @@ public class GenericOrganizationalUnitPublicationsTable
final ContentSection section = CMS.getContext().
getContentSection();
final ItemResolver resolver = section.getItemResolver();
final Link link = new Link(
String.format("%s (%s)",
value.toString(),
publication.getLanguage()),
resolver.generateItemURL(state,
publication,
section,
publication.getVersion()));
final Link link = new Link(value.toString(),
resolver.generateItemURL(
state,
publication,
section,
publication.getVersion()));
return link;
} else {
final Label label = new Label(String.format("%s (%s)",
value.toString(),
publication.
getLanguage()));
final Label label = new Label(value.toString());
return label;
}
}