From bf5da0ea4a5c6f3b68f8457bbca2a6f5c87f450e Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Fri, 20 Aug 2010 12:44:10 +0200
Subject: [PATCH] Avoid reloadBindings twice for tabs of an order after saving
 it

FEA: ItEr60S18CambiosPantallaArbolPedido
---
 .../web/orders/OrderCRUDController.java          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index bed65573a..679e80840 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -520,7 +520,8 @@ public class OrderCRUDController extends GenericForwardComposer {
         return (Order) orderModel.getOrder();
     }
 
-    public void saveAndContinue() {        
+    public void saveAndContinue() {
+
         Order order = (Order) orderModel.getOrder();
         final boolean isNewObject = order.isNewObject();
         setCurrentTab();
@@ -528,10 +529,9 @@ public class OrderCRUDController extends GenericForwardComposer {
         final boolean couldSave = save();
 
         if (couldSave) {
-            if(orderModel.userCanRead(order, SecurityUtils.getSessionUserLoginName())) {
-                updateDisabilitiesOnInterface();
-                initializeTabs();
-                showWindow(editWindow);
+
+            if (orderModel.userCanRead(order, SecurityUtils.getSessionUserLoginName())) {
+                refreshOrderWindow();
 
                 // come back to the current tab after initialize all tabs.
                 resetSelectedTab();
@@ -556,6 +556,12 @@ public class OrderCRUDController extends GenericForwardComposer {
         }        
     }
 
+    private void refreshOrderWindow() {
+        updateDisabilitiesOnInterface();
+        initializeTabs();
+        getVisibility().showOnly(editWindow);
+    }
+
     public void saveAndExit() {
         setCurrentTab();
         final boolean couldSave = save();