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

Formatierungen und kleinere Korrekturen 

git-svn-id: https://svn.libreccm.org/ccm/trunk@873 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-04-21 08:41:56 +00:00
parent f1bbba529f
commit 418544f2d5
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java
View File

@ -23,6 +23,8 @@ import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.bebop.form.Option; import com.arsdigita.bebop.form.Option;
@ -50,7 +52,9 @@ import org.apache.log4j.Logger;
*/ */
public class GenericOrganizationalUnitPersonAddForm public class GenericOrganizationalUnitPersonAddForm
extends BasicItemForm extends BasicItemForm
implements FormSubmissionListener { implements FormProcessListener,
FormInitListener,
FormSubmissionListener {
private static final Logger logger = Logger.getLogger( private static final Logger logger = Logger.getLogger(
GenericOrganizationalUnitPersonAddForm.class); GenericOrganizationalUnitPersonAddForm.class);
@ -63,7 +67,7 @@ public class GenericOrganizationalUnitPersonAddForm
public GenericOrganizationalUnitPersonAddForm(ItemSelectionModel itemModel, public GenericOrganizationalUnitPersonAddForm(ItemSelectionModel itemModel,
GenericOrganizationalUnitPersonSelector selector) { GenericOrganizationalUnitPersonSelector selector) {
super("PersonAddForm", itemModel); super("PersonAddForm", itemModel);
this.selector = selector; this.selector = selector;
addSubmissionListener(this); addSubmissionListener(this);
} }
@ -73,8 +77,8 @@ public class GenericOrganizationalUnitPersonAddForm
"cms.contenttypes.ui.genericorgaunit.select_person").localize())); "cms.contenttypes.ui.genericorgaunit.select_person").localize()));
m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.
findByAssociatedObjectType(getPersonType())); findByAssociatedObjectType(getPersonType()));
m_itemSearch.getItemField().addValidationListener( /*m_itemSearch.getItemField().addValidationListener(
new NotNullValidationListener()); new NotNullValidationListener());*/
add(this.m_itemSearch); add(this.m_itemSearch);
selectedPersonNameLabel = new Label(""); selectedPersonNameLabel = new Label("");
@ -126,7 +130,7 @@ public class GenericOrganizationalUnitPersonAddForm
} }
@Override @Override
public void init(FormSectionEvent fse) { public void init(FormSectionEvent fse) throws FormProcessException {
FormData data = fse.getFormData(); FormData data = fse.getFormData();
PageState state = fse.getPageState(); PageState state = fse.getPageState();
@ -196,7 +200,7 @@ public class GenericOrganizationalUnitPersonAddForm
selector.setSelectedPerson(null); selector.setSelectedPerson(null);
selector.setSelectedPersonRole(null); selector.setSelectedPersonRole(null);
selector.setSelectedPersonRole(null); selector.setSelectedPersonStatus(null);
persons.close(); persons.close();
} }
@ -206,11 +210,11 @@ public class GenericOrganizationalUnitPersonAddForm
} }
public void submitted(FormSectionEvent fse) throws FormProcessException { public void submitted(FormSectionEvent fse) throws FormProcessException {
if (getSaveCancelSection().getCancelButton().isSelected( if (this.getSaveCancelSection().getCancelButton().isSelected(
fse.getPageState())) { fse.getPageState())) {
selector.setSelectedPerson(null); selector.setSelectedPerson(null);
selector.setSelectedPersonRole(null); selector.setSelectedPersonRole(null);
selector.setSelectedPersonRole(null); selector.setSelectedPersonStatus(null);
init(fse); init(fse);
} }

2
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonPropertiesStep.java
View File

@ -101,6 +101,6 @@ public class GenericOrganizationalUnitPersonPropertiesStep
@Override @Override
public void showEditComponent(final PageState state) { public void showEditComponent(final PageState state) {
showComponent(state, ADD_PERSON_SHEET_NAME); this.showComponent(state, ADD_PERSON_SHEET_NAME);
} }
} }

6
ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectMemberAddForm.java
View File

@ -19,6 +19,8 @@
*/ */
package com.arsdigita.cms.contenttypes.ui; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.GenericPerson;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.SciProject; import com.arsdigita.cms.contenttypes.SciProject;
@ -34,9 +36,9 @@ public class SciProjectMemberAddForm
public SciProjectMemberAddForm( public SciProjectMemberAddForm(
ItemSelectionModel itemModel, ItemSelectionModel itemModel,
GenericOrganizationalUnitPersonSelector personSelector) { GenericOrganizationalUnitPersonSelector personSelector) {
super(itemModel, personSelector); super(itemModel, personSelector);
} }
@Override @Override
protected String getPersonType() { protected String getPersonType() {
return GenericPerson.class.getName(); return GenericPerson.class.getName();