From 771a39152574a205ad10281556eaabbfa1c071bc Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 9 Jun 2017 07:28:23 +0000
Subject: [PATCH] Some small bug fixes for the new Talk content type

git-svn-id: https://svn.libreccm.org/ccm/trunk@4764 8810af33-2d31-482b-a856-94f89814c4df
---
 .../contenttypes/ui/EventPropertiesStep.java  |  1 +
 .../pdl/com/arsdigita/content-types/Talk.pdl  |  8 +++---
 .../com/arsdigita/cms/contenttypes/Talk.xml   |  2 +-
 .../cms/contenttypes/TalkResources.properties |  6 +++++
 .../contenttypes/TalkResources_de.properties  |  5 ++++
 .../cms/contenttypes/ui/TalkCreate.java       | 27 +++++++++++++++++++
 .../cms/contenttypes/ui/TalkPropertyForm.java | 12 ++++++++-
 7 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkCreate.java

diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java
index a004f587b..7e12b5336 100755
--- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java
+++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java
@@ -169,6 +169,7 @@ public class EventPropertiesStep extends SimpleEditStep {
          * @return           A String representation of the retrieved boolean
          *                   attribute of the domain object.
          */
+        @Override
         public String format(DomainObject obj, String attribute, PageState state) {
  
             if ( obj != null && obj instanceof Event) {
diff --git a/ccm-sci-publications-talk/pdl/com/arsdigita/content-types/Talk.pdl b/ccm-sci-publications-talk/pdl/com/arsdigita/content-types/Talk.pdl
index 9f0b6cf0d..45a8c1483 100644
--- a/ccm-sci-publications-talk/pdl/com/arsdigita/content-types/Talk.pdl
+++ b/ccm-sci-publications-talk/pdl/com/arsdigita/content-types/Talk.pdl
@@ -4,11 +4,11 @@ import com.arsdigita.cms.ContentPage;
 
 object type Talk extends Publication {
 
-    reference key (ct_talks.talk_id);
+    reference key (ct_scipublications_talks.talk_id);
 
-    String[0..1] event = ct_talks.event;
-    Date[0..1] dateOfTalk = ct_talks.date;
-    String[0..1] place = ct_talks.place;
+    String[0..1] event = ct_scipublications_talks.event;
+    Date[0..1] dateOfTalk = ct_scipublications_talks.date;
+    String[0..1] place = ct_scipublications_talks.place;
 
 }
 
diff --git a/ccm-sci-publications-talk/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Talk.xml b/ccm-sci-publications-talk/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Talk.xml
index 3a1b874ac..7b30c2d87 100644
--- a/ccm-sci-publications-talk/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Talk.xml
+++ b/ccm-sci-publications-talk/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Talk.xml
@@ -14,7 +14,7 @@
       
       <ctd:authoring-step
           labelKey="publications.ui.talk.basic_properties.title"
-          labelBundle="com.arsdigita.cms.contenttypes.ui.TalkResources"
+          labelBundle="com.arsdigita.cms.contenttypes.TalkResources"
           descriptionKey="publications.ui.talk.basic_properties.description"
           descriptionBundle="com.arsdigita.cms.contenttypes.ui.TalkResources"
           component="com.arsdigita.cms.contenttypes.ui.TalkPropertiesStep"
diff --git a/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources.properties b/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources.properties
index 7f666caca..ee3acbda6 100644
--- a/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources.properties
+++ b/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources.properties
@@ -1,4 +1,10 @@
+cms.contenttypes.talk.type_label=Talk
+
 publications.ui.talk.place=Place
 
 publications.ui.talk.date=Date
 publications.ui.talk.event=Event
+publications.ui.talk.basic_properties.description=A content item for talks given on an event.
+publications.ui.talk.basic_properties.title=Basic properties
+publications.ui.talk.edit_basic_sheet=Edit basic properties
+publications.ui.talk.basic_properties=Basic properties
diff --git a/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources_de.properties b/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources_de.properties
index d25118c08..e955ff7fa 100644
--- a/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources_de.properties
+++ b/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources_de.properties
@@ -2,3 +2,8 @@ publications.ui.talk.place=Ort
 
 publications.ui.talk.date=Datum
 publications.ui.talk.event=Veranstaltung
+cms.contenttypes.talk.type_label=Vortrag
+publications.ui.talk.basic_properties.description=Content Item f\u00fcr Vortr\u00e4ge im Rahmen einer Veranstaltung.
+publications.ui.talk.basic_properties.title=Basiseigenschaften
+publications.ui.talk.edit_basic_sheet=Basiseigenschaften bearbeiten
+publications.ui.talk.basic_properties=Basiseigenschaften
diff --git a/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkCreate.java b/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkCreate.java
new file mode 100644
index 000000000..5640edb9d
--- /dev/null
+++ b/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkCreate.java
@@ -0,0 +1,27 @@
+package com.arsdigita.cms.contenttypes.ui;
+
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ItemSelectionModel;
+import com.arsdigita.cms.contenttypes.PublicationBundle;
+import com.arsdigita.cms.contenttypes.TalkBundle;
+import com.arsdigita.cms.ui.authoring.CreationSelector;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class TalkCreate extends PublicationCreate {
+    
+    public TalkCreate(final ItemSelectionModel itemSelectionModel,
+                      final CreationSelector creationSelector) {
+        super(itemSelectionModel, creationSelector);
+    }
+    
+    @Override
+    public PublicationBundle createBundle(final ContentItem primary) {
+        return new TalkBundle(primary);
+    }
+    
+}
diff --git a/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkPropertyForm.java b/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkPropertyForm.java
index a82c12ac2..ec031b16f 100644
--- a/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkPropertyForm.java
+++ b/ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkPropertyForm.java
@@ -13,6 +13,7 @@ import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.Talk;
+import com.arsdigita.cms.contenttypes.TalkGlobalizationUtil;
 
 /**
  *
@@ -46,16 +47,25 @@ public class TalkPropertyForm
         final ParameterModel placeParameter
                                  = new StringParameter(Talk.PLACE);
         final TextField placeField = new TextField(placeParameter);
+        placeField
+            .setLabel(TalkGlobalizationUtil.globalize(
+                "publications.ui.talk.place"));
         add(placeField);
 
         final ParameterModel dateParameter
                                  = new DateParameter(Talk.DATE_OF_TALK);
         final Date dateField = new Date(dateParameter);
+        dateField
+            .setLabel(TalkGlobalizationUtil.globalize(
+                "publications.ui.talk.date"));
         add(dateField);
 
         final ParameterModel eventParameter
                                  = new StringParameter(Talk.EVENT);
         final TextField eventField = new TextField(eventParameter);
+        eventField
+            .setLabel(TalkGlobalizationUtil.globalize(
+                "publications.ui.talk.event"));
         add(eventField);
     }
 
@@ -85,7 +95,7 @@ public class TalkPropertyForm
                 && getSaveCancelSection()
                 .getSaveButton()
                 .isSelected(event.getPageState())) {
-            
+
             talk.setDateOfTalk((java.util.Date) data.get(Talk.DATE_OF_TALK));
             talk.setEvent((String) data.get(Talk.EVENT));
             talk.setPlace((String) data.get(Talk.PLACE));