From ced5ee10c2a1f55eea9b6159898b2c89685ec707 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 10 Apr 2012 09:41:29 +0000
Subject: [PATCH] =?UTF-8?q?Weitere=20Korrekturen=20f=C3=BCr=20Publizierenp?=
 =?UTF-8?q?rozess?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1576 8810af33-2d31-482b-a856-94f89814c4df
---
 .../src/com/arsdigita/cms/ContentItem.java    |  5 ++--
 .../cms/contenttypes/PublicationBundle.java   |  6 ++--
 ...icOrganizationalUnitPublicationsTable.java | 30 +++++++++----------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ccm-cms/src/com/arsdigita/cms/ContentItem.java b/ccm-cms/src/com/arsdigita/cms/ContentItem.java
index a5797b8f2..8caf879b4 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentItem.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentItem.java
@@ -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);
                     }
                 }
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java
index 5f70a8a10..a03957b33 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java
@@ -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() {
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
index 43e852cf6..7c5353ace 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
@@ -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;
             }
         }