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

Fehler in ccm-cms-types-genericorganization korrigiert 

git-svn-id: https://svn.libreccm.org/ccm/trunk@160 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2009-05-11 09:15:24 +00:00
parent a189ecb48f
commit ac67ccd752
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml
View File

@ -5,7 +5,7 @@
xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
<ctd:content-type <ctd:content-type
label="Genericorganization" label="GenericOrganization"
description="A generic, GenericOrganization type" description="A generic, GenericOrganization type"
objectType="com.arsdigita.cms.contenttypes.GenericOrganization" objectType="com.arsdigita.cms.contenttypes.GenericOrganization"
classname="com.arsdigita.cms.contenttypes.GenericOrganization"> classname="com.arsdigita.cms.contenttypes.GenericOrganization">

13
ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationPropertyForm.java
View File

@ -43,6 +43,7 @@ import com.arsdigita.cms.contenttypes.GenericOrganization;
import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.BasicPageForm;
import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainCollection;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.log4j.Level;
import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.util.GlobalizationUtil;
@ -75,9 +76,9 @@ public class GenericOrganizationPropertyForm extends BasicPageForm implements Fo
super.addWidgets(); super.addWidgets();
add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.genericorganization.organizationname"))); add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.genericorganization.organizationname")));
ParameterModel nameParam = new StringParameter(ORGANIZATIONNAME); ParameterModel organizationNameParam = new StringParameter(ORGANIZATIONNAME);
TextField name = new TextField(nameParam); TextField organizationName = new TextField(organizationNameParam);
add(name); add(organizationName);
} }
public void init(FormSectionEvent fse) { public void init(FormSectionEvent fse) {
@ -88,8 +89,11 @@ public class GenericOrganizationPropertyForm extends BasicPageForm implements Fo
} }
public void submitted(FormSectionEvent fse) { public void submitted(FormSectionEvent fse) {
s_log.log (Level.DEBUG, "GenericOrganization submitted");
if (m_step != null if (m_step != null
&& getSaveCancelSection().getCancelButton().isSelected(fse.getPageState())) { && getSaveCancelSection().getCancelButton().isSelected(fse.getPageState())) {
s_log.log (Level.DEBUG, "GenericOrganization submit canceled");
m_step.cancelStreamlinedCreation(fse.getPageState()); m_step.cancelStreamlinedCreation(fse.getPageState());
} }
} }
@ -101,7 +105,8 @@ public class GenericOrganizationPropertyForm extends BasicPageForm implements Fo
if (orga != null if (orga != null
&& getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) { && getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) {
orga.setName((String)data.get(ORGANIZATIONNAME));
orga.setOrganizationName((String)data.get(ORGANIZATIONNAME));
orga.save(); orga.save();
} }

8
ccm-cms-types-person/src/com/arsdigita/cms/contenttypes/ui/PersonPropertiesStep.java
View File

@ -57,10 +57,10 @@ public class PersonPropertiesStep extends SimpleEditStep {
public static Component getPersonPropertySheet(ItemSelectionModel itemModel) { public static Component getPersonPropertySheet(ItemSelectionModel itemModel) {
DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel); DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), Person.SURNAME); sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.person.surname").localize(), Person.SURNAME);
sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), Person.GIVENNAME); sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.person.givenname").localize(), Person.GIVENNAME);
sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), Person.TITLEPRE); sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.person.titlepre").localize(), Person.TITLEPRE);
sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), Person.TITLEPOST); sheet.add((String)PersonGlobalizationUtil.globalize("cms.contenttypes.ui.person.titlepost").localize(), Person.TITLEPOST);
if(!ContentSection.getConfig().getHideLaunchDate()) { if(!ContentSection.getConfig().getHideLaunchDate()) {
sheet.add((String)PersonGlobalizationUtil.globalize("cms.ui.authoring.page_launch_date").localize(), sheet.add((String)PersonGlobalizationUtil.globalize("cms.ui.authoring.page_launch_date").localize(),