RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr33S09CUConfiguracionDeOrganizacionsDeTraballoConUnidadesTraballoItEr32S11: Add Save & Continue button

Browse source
This commit is contained in:
Diego Pino Garcia 2009-11-02 18:36:19 +01:00 • committed by Javier Moran Rua
parent fd95db95af
commit beca85464c
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
View file

@ -80,7 +80,7 @@ public interface IOrderModel {
boolean isAlreadyScheduled(Order order);
void prepareEditFor(Order order);
void initEdit(Order order);
void prepareForCreate();

16
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -149,12 +149,22 @@ public class OrderCRUDController extends GenericForwardComposer {
return orderModel.getOrder();
}
public void save() {
public void saveAndContinue() {
save();
orderModel.initEdit((Order) orderModel.getOrder());
initializeTabs();
}
public void saveAndExit() {
save();
goToList();
}
private void save() {
try {
manageOrderElementAdvancesController.save();
orderModel.save();
messagesForUser.showMessage(Level.INFO, _("Order saved"));
goToList();
} catch (ValidationException e) {
if (e.getInvalidValues().length == 0) {
messagesForUser.showMessage(Level.INFO, e.getMessage());
@ -260,7 +270,7 @@ public class OrderCRUDController extends GenericForwardComposer {
private Runnable onUp;
public void goToEditForm(Order order) {
orderModel.prepareEditFor(order);
orderModel.initEdit(order);
showEditWindow(_("Edit order"));
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

@ -144,7 +144,7 @@ public class OrderModel implements IOrderModel {
@Override
@Transactional(readOnly = true)
public void prepareEditFor(Order order) {
public void initEdit(Order order) {
Validate.notNull(order);
initializeCacheLabels();
loadCriterions();

8
navalplanner-webapp/src/main/webapp/orders/_edition.zul
View file

@ -96,7 +96,9 @@
</tabpanel>
</tabpanels>
</tabbox>
<button label="${i18n:_('Save')}" onClick="controller.save()" />
<button label="${i18n:_('Cancel')}" onClick="controller.cancel()" />
<hbox>
<button label="${i18n:_('Save')}" onClick="controller.saveAndExit()" />
<button label="${i18n:_('Save &amp; Continue')}" onClick="controller.saveAndContinue()" />
<button label="${i18n:_('Cancel')}" onClick="controller.cancel()" />
</hbox>
</window>