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

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
master
jensp 2017-06-09 07:28:23 +00:00
parent 006fbd0943
commit 771a391525
7 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java
View File

@ -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) {

8
ccm-sci-publications-talk/pdl/com/arsdigita/content-types/Talk.pdl
View File

@ -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;
}

2
ccm-sci-publications-talk/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Talk.xml
View File

@ -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"

6
ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources.properties
View File

@ -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

5
ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/TalkResources_de.properties
View File

@ -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

27
ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkCreate.java 100644
View File

@ -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);
}
}

10
ccm-sci-publications-talk/src/com/arsdigita/cms/contenttypes/ui/TalkPropertyForm.java
View File

@ -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);
}