Alona Kaplan has uploaded a new change for review.

Change subject: webadmin: Rephrase edit mgmt network error(#845274)
......................................................................

webadmin: Rephrase edit mgmt network error(#845274)

https://bugzilla.redhat.com/845274

Change to- "Cannot edit Management Network when there are Clusters in the
Data Center"

Change-Id: I2dd989472f9196c7b32c2c08cbc7f9ba11b249d5
Signed-off-by: Alona Kaplan <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
M 
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/7129/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
index b84afbe..87314b7 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java
@@ -6,7 +6,6 @@
 import org.ovirt.engine.core.common.businessentities.AuditLog;
 import org.ovirt.engine.core.common.businessentities.StorageDomainType;
 import org.ovirt.engine.core.common.businessentities.storage_domains;
-import org.ovirt.engine.core.common.mode.ApplicationMode;
 import org.ovirt.engine.core.common.users.VdcUser;
 import org.ovirt.engine.core.compat.Event;
 import org.ovirt.engine.core.compat.EventArgs;
@@ -538,7 +537,7 @@
         volumeList.setIsAvailable(model.getType() == 
SystemTreeItemType.Cluster_Gluster
                 || model.getType() == SystemTreeItemType.Volume
                 || model.getType() == SystemTreeItemType.Volumes
-                || (ApplicationModeHelper.getUiMode() == 
ApplicationMode.GlusterOnly && model.getType() == SystemTreeItemType.System));
+                || model.getType() == SystemTreeItemType.System);
 
         if (model.getType() == SystemTreeItemType.Cluster) {
             volumeList.setIsAvailable(false);
diff --git 
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
 
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
index 3ff8dbf..e452c34 100644
--- 
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
+++ 
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
@@ -577,7 +577,7 @@
        @DefaultStringValue("Logical Network(s)")
        String logicalNetworksMsg();
 
-       @DefaultStringValue("Cannot edit Management Network when there are one 
or more Clusters in the Data Center")
+       @DefaultStringValue("Cannot edit Management Network when there are 
Clusters in the Data Center")
        String cannotDetachManagementNetworkFromClustersMsg();
 
        @DefaultStringValue("You are about to attach the network to all the 
selected clusters and to detach the network from all the unselected 
clusters.\n\nAre you sure you want to continue?")


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

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

Reply via email to