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

ccm-ldn-types-esdservice und ccm-ldn-types-contact wechseln nach dem Anlegen jetzt direkt in den Bearbeitungsmodus und leiten nach Bearbeitung zum nächsten Schritt weiter (Tickets #1773, #1772). 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2230 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-06-27 17:28:01 +00:00
parent c26f5b917d
commit a30e4b7974
4 changed files with 137 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPropertiesStep.java
View File

@ -49,12 +49,13 @@ public class ContactPropertiesStep extends SimpleEditStep {
BasicPageForm editSheet; BasicPageForm editSheet;
editSheet = new ContactPropertyForm(itemModel); editSheet = new ContactPropertyForm(itemModel, this);
add(EDIT_SHEET_NAME, add(EDIT_SHEET_NAME,
GlobalizationUtil.globalize("cms.ui.edit"), GlobalizationUtil.globalize("cms.ui.edit"),
new WorkflowLockedComponentAccess(editSheet, itemModel), new WorkflowLockedComponentAccess(editSheet, itemModel),
editSheet.getSaveCancelSection().getCancelButton()); editSheet.getSaveCancelSection().getCancelButton());
setDefaultEditKey(EDIT_SHEET_NAME);
setDisplayComponent(getContactPropertySheet(itemModel)); setDisplayComponent(getContactPropertySheet(itemModel));
} }
@ -103,6 +104,7 @@ public class ContactPropertiesStep extends SimpleEditStep {
.localize(); .localize();
} }
} }
}); });
sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.description"), sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.description"),

7
ccm-ldn-types-contact/src/com/arsdigita/london/contenttypes/ui/ContactPropertyForm.java
View File

@ -53,6 +53,8 @@ public class ContactPropertyForm extends BasicPageForm {
*/ */
public static final String ID = "Contact_edit"; public static final String ID = "Contact_edit";
private final ContactPropertiesStep step;
/** /**
* Creates a new form to edit the Contact object specified by the item * Creates a new form to edit the Contact object specified by the item
* selection model passed in. * selection model passed in.
@ -60,8 +62,9 @@ public class ContactPropertyForm extends BasicPageForm {
* @param itemModel The ItemSelectionModel to use to obtain the Contact to * @param itemModel The ItemSelectionModel to use to obtain the Contact to
* work on * work on
*/ */
public ContactPropertyForm(ItemSelectionModel itemModel) { public ContactPropertyForm(ItemSelectionModel itemModel, ContactPropertiesStep step) {
super(ID, itemModel); super(ID, itemModel);
this.step = step;
} }
/** /**
@ -215,6 +218,8 @@ public class ContactPropertyForm extends BasicPageForm {
contact.setDeptName((String) data.get(Contact.DEPT_NAME)); contact.setDeptName((String) data.get(Contact.DEPT_NAME));
contact.setRole((String) data.get(Contact.ROLE)); contact.setRole((String) data.get(Contact.ROLE));
contact.save(); contact.save();
step.maybeForwardToNextStep(fse.getPageState());
} }
} }
} }

7
ccm-ldn-types-esdservice/src/com/arsdigita/london/contenttypes/ui/ESDServicePropertiesForm.java
View File

@ -41,12 +41,14 @@ public class ESDServicePropertiesForm extends BasicPageForm {
/** Name of this form */ /** Name of this form */
private static final String ID = "ESDService_edit"; private static final String ID = "ESDService_edit";
private final ESDServicePropertiesStep step;
/** /**
* @param itemModel * @param itemModel
*/ */
public ESDServicePropertiesForm(ItemSelectionModel itemModel) { public ESDServicePropertiesForm(ItemSelectionModel itemModel, ESDServicePropertiesStep step) {
super(ID, itemModel); super(ID, itemModel);
this.step = step;
} }
/** /**
@ -85,6 +87,9 @@ public class ESDServicePropertiesForm extends BasicPageForm {
&& getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) { && getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) {
esdService.setServiceTimes((String) data.get(ESDService.SERVICE_TIMES)); esdService.setServiceTimes((String) data.get(ESDService.SERVICE_TIMES));
step.maybeForwardToNextStep(fse.getPageState());
} }
} }
} }

3
ccm-ldn-types-esdservice/src/com/arsdigita/london/contenttypes/ui/ESDServicePropertiesStep.java
View File

@ -55,12 +55,13 @@ public class ESDServicePropertiesStep extends SimpleEditStep {
ESDServicePropertiesForm editSheet; ESDServicePropertiesForm editSheet;
editSheet = new ESDServicePropertiesForm(itemModel); editSheet = new ESDServicePropertiesForm(itemModel, this);
add(EDIT_SHEET_NAME, add(EDIT_SHEET_NAME,
GlobalizationUtil.globalize("cms.ui.edit"), GlobalizationUtil.globalize("cms.ui.edit"),
new WorkflowLockedComponentAccess(editSheet, itemModel), new WorkflowLockedComponentAccess(editSheet, itemModel),
editSheet.getSaveCancelSection().getCancelButton()); editSheet.getSaveCancelSection().getCancelButton());
setDefaultEditKey(EDIT_SHEET_NAME);
setDisplayComponent(getESDServicePropertySheet(itemModel)); setDisplayComponent(getESDServicePropertySheet(itemModel));
} }