Lior Vernia has uploaded a new change for review.

Change subject: webadmin: Change status panel before command execution
......................................................................

webadmin: Change status panel before command execution

Since the candidate operation event was triggered following the
execution of the operation, an operation explanation would linger on
even after the operation was executed (instead of the status panel
returning to the default "Drag to make changes".

Change-Id: Ic8b1ee2481e6596b7c4bbd1f94b826127b57f2c5
Bug-Url: https://bugzilla.redhat.com/1115109
Signed-off-by: Lior Vernia <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/31282/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
index a1c41b4..40480b9 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
@@ -217,16 +217,15 @@
 
         NetworkOperation candidate = NetworkOperationFactory.operationFor(op1, 
op2, true);
 
-        if (drop) {
-            onOperation(candidate, candidate.getCommand(op1, op2, allNics));
-        }
-
         // raise the candidate event only if it was changed or if a drop 
occurred
         if (drop || !candidate.equals(currentCandidate) || !equals(op1, 
currentOp1) || !equals(op2, currentOp2)) {
             currentCandidate = candidate;
             currentOp1 = op1;
             currentOp2 = op2;
             getOperationCandidateEvent().raise(this, new 
OperationCadidateEventArgs(candidate, op1, op2, drop));
+            if (drop) {
+                onOperation(candidate, candidate.getCommand(op1, op2, 
allNics));
+            }
         }
         return !candidate.isNullOperation();
     }


-- 
To view, visit http://gerrit.ovirt.org/31282
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8b1ee2481e6596b7c4bbd1f94b826127b57f2c5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to