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

ItEr17S13CUConfiguracionDeOrganizacionsDeTraballoConUnidadesTraballoItEr15S11: Removing Cancel button on edit order element popup.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-07-14 10:00:49 +02:00 • committed by Javier Moran Rua
parent 104b0be12d
commit 2d4626df2e
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -225,18 +225,11 @@ public class OrderElementController extends GenericForwardComposer {
reloadSelectedCriterionTypes();
}
/**
* Just close the {@link Popup}
*/
public void cancel() {
popup.close();
}
/**
* Just close the {@link Popup} and refresh parent status. Save actions are
* managed by "save-when" at .zul file.
*/
public void save() {
public void back() {
popup.close();
Util.reloadBindings(popup.getParent());
}

20
navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
View file

@ -8,17 +8,17 @@
<label value="Order Element Name" />
<textbox id="name"
value="@{orderElementController.orderElement.name,
save-when='saveButton.onClick'}" />
save-when='backButton.onClick'}" />
</hbox>
<hbox>
<label value="Init Date" />
<datebox id="initDate"
value="@{orderElementController.orderElement.initDate,
save-when='saveButton.onClick'}" />
save-when='backButton.onClick'}" />
<checkbox id="mandatoryInit"
checked="@{orderElementController.orderElement.mandatoryInit},
save-when='saveButton.onClick'" />
save-when='backButton.onClick'" />
<label value="Mandatory" />
</hbox>
@ -26,10 +26,10 @@
<label value="End Date" />
<datebox id="endDate"
value="@{orderElementController.orderElement.endDate,
save-when='saveButton.onClick'}" />
save-when='backButton.onClick'}" />
<checkbox id="mandatoryEnd"
checked="@{orderElementController.orderElement.mandatoryEnd,
save-when='saveButton.onClick'}" />
save-when='backButton.onClick'}" />
<label value="Mandatory" />
</hbox>
@ -96,14 +96,12 @@
<textbox id="description" rows="4"
value="@{orderElementController.orderElement.description,
save-when='saveButton.onClick'}" />
save-when='backButton.onClick'}" />
<hbox>
<button onClick="orderElementController.cancel();"
label="${arg.cancel_button_label}" />
<button id="saveButton"
onClick="orderElementController.save();"
label="${arg.save_button_label}" />
<button id="backButton"
onClick="orderElementController.back();"
label="${arg.back_button_label}" />
</hbox>
</vbox>

2
navalplanner-webapp/src/main/webapp/orders/orders.zul
View file

@ -20,7 +20,7 @@
<edition top_id="editWindow" title="Edit Personal Data"
save_button_label="Save" cancel_button_label="Cancel" />
<orderElementPopup top_id="editOrderElementPopup" title="Edit Order Element"
save_button_label="Save" cancel_button_label="Cancel" />
back_button_label="Back" />
<window visible="@{controller.confirmingRemove}"
id="confirmRemove" title="Confirmación" width="500px"
position="center">