summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.gui
diff options
context:
space:
mode:
authorSelvam <selvam@gluster.com>2011-04-18 14:15:39 +0530
committerSelvam <selvam@gluster.com>2011-04-18 15:01:44 +0530
commitf8cc319bb5d73350b73b2a38d6b9b7f46ab8d39a (patch)
treef7d38b2289f377d57ee63d67ce9a7feb2ce60322 /src/com.gluster.storage.management.gui
parenta907385e3ff254ae7a8c316ae7bf4ce1a5fcb491 (diff)
Access control validation fix
Diffstat (limited to 'src/com.gluster.storage.management.gui')
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
index 497e939e..956c07ea 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
@@ -211,17 +211,20 @@ public class VolumeSummaryView extends ViewPart {
guiHelper.setStatusMessage("Setting access control list to [" + newACL + "]...");
parent.update();
- if (!newACL.equals(volume.getAccessControlList()) && ValidationUtil.isValidAccessControl(newACL)) {
- BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
+ if (newACL.equals(volume.getAccessControlList())) {
+ accessControlText.setEnabled(false);
+ changeLink.setText("change");
+ } else if (ValidationUtil.isValidAccessControl(newACL)) {
+ BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
@Override
public void run() {
Status status = (new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken()))
- .setVolumeOption(volume.getName(), Volume.OPTION_AUTH_ALLOW, newACL);
-
+ .setVolumeOption(volume.getName(), Volume.OPTION_AUTH_ALLOW, newACL);
+
if (status.isSuccess()) {
accessControlText.setEnabled(false);
changeLink.setText("change");
-
+
GlusterDataModelManager.getInstance().setAccessControlList(volume, newACL);
} else {
MessageDialog.openError(Display.getDefault().getActiveShell(), "Access control",
@@ -230,8 +233,7 @@ public class VolumeSummaryView extends ViewPart {
}
});
} else {
- MessageDialog.openError(Display.getDefault().getActiveShell(), "Access control",
- "Invalid IP / Host name ");
+ MessageDialog.openError(Display.getDefault().getActiveShell(), "Access control", "Invalid IP / Host name ");
}
guiHelper.clearStatusMessage();
parent.update();