[Engine-patches] Change in ovirt-engine[master]: webadmin: Add ability to set the "force" label

[mkolesni]

Mike Kolesnik has uploaded a new change for review.

Change subject: webadmin: Add ability to set the "force" label
......................................................................

webadmin: Add ability to set the "force" label

Added ability to set the "Force remove" check box label to be able to
use it to specify a more detailed message.
The force default value will be taken from the field force in the model.

Change-Id: If200c35cf36cf6f0fd7aa3d8ad0b0b59ce3ac1f8
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConfirmationModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
3 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/22614/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java
index 9af0050..13e4e1e 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java
@@ -140,6 +140,19 @@
             }
         });
 
+        force.setLabel(object.getForceLabel());
+        force.asCheckBox().setValue((Boolean) object.getForce().getEntity());
+        // Bind "Force.Label"
+        object.getPropertyChangedEvent().addListener(new IEventListener() {
+            @Override
+            public void eventRaised(Event ev, Object sender, EventArgs args) {
+                if ("ForceLabel".equals(((PropertyChangedEventArgs) 
args).PropertyName)) { //$NON-NLS-1$
+                    ConfirmationModel entity = (ConfirmationModel) sender;
+                    force.setLabel(entity.getForceLabel());
+                }
+            }
+        });
+
         setNote(object.getNote());
         // Bind "Note"
         object.getPropertyChangedEvent().addListener(new IEventListener() {
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConfirmationModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConfirmationModel.java
index b999efc..3d141f1 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConfirmationModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConfirmationModel.java
@@ -32,6 +32,20 @@
         force = value;
     }
 
+    private String forceLabel;
+
+    public String getForceLabel() {
+        return forceLabel;
+    }
+
+    public void setForceLabel(String forceLabel) {
+        if (!StringHelper.stringsEqual(getForceLabel(), forceLabel))
+        {
+            this.forceLabel = forceLabel;
+            onPropertyChanged(new PropertyChangedEventArgs("ForceLabel")); 
//$NON-NLS-1$
+        }
+    }
+
     private String note;
 
     public String getNote()
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
index 7392294..288deb8 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java
@@ -75,7 +75,11 @@
         for (Object a : sourceListModel.getSelectedItems())
         {
             Network network = (Network) a;
-            pb.add(new RemoveNetworkParameters(network.getId()));
+            if (network.isExternal()) {
+                pb.add(new RemoveNetworkParameters(network.getId(), 
getForce().getIsSelected()));
+            } else {
+                pb.add(new RemoveNetworkParameters(network.getId()));
+            }
         }
         Frontend.getInstance().runMultipleAction(VdcActionType.RemoveNetwork, 
pb);
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If200c35cf36cf6f0fd7aa3d8ad0b0b59ce3ac1f8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches