Yair Zaslavsky has uploaded a new change for review.
Change subject: aaa: disabling "go" search button when there are no namespaces
......................................................................
aaa: disabling "go" search button when there are no namespaces
Change-Id: I4eb1ed2648f3dccc39af9adf409d8c0ec73b2a6f
Topic: AAA
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableNamespacesQuery.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/permissions/AbstractPermissionsPopupPresenterWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/UiCommandButton.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
5 files changed, 30 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/32213/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableNamespacesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableNamespacesQuery.java
index 35104f8..1608fc8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableNamespacesQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableNamespacesQuery.java
@@ -28,7 +28,7 @@
protected void executeQueryCommand() {
HashMap<String, List<String>> namespacesMap = new HashMap<>();
for (ExtensionProxy authz:
EngineExtensionsManager.getInstance().getExtensionsByService(Authz.class.getName()))
{
- for (String namespace :
authz.getContext().get(Authz.ContextKeys.AVAILABLE_NAMESPACES,
Arrays.asList("*"))) {
+ for (String namespace :
authz.getContext().get(Authz.ContextKeys.AVAILABLE_NAMESPACES,
Arrays.asList(""))) {
MultiValueMapUtils.addToMap(AuthzUtils.getName(authz),
namespace, namespacesMap);
}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/permissions/AbstractPermissionsPopupPresenterWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/permissions/AbstractPermissionsPopupPresenterWidget.java
index c077684..4bdb065 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/permissions/AbstractPermissionsPopupPresenterWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/permissions/AbstractPermissionsPopupPresenterWidget.java
@@ -51,6 +51,8 @@
void hideEveryoneSelection(Boolean indic);
+ void enableGoButton(Boolean value);
+
}
public AbstractPermissionsPopupPresenterWidget(EventBus eventBus, V view) {
@@ -107,6 +109,15 @@
}
}));
+ model.getProfile().getItemsChangedEvent().addListener(new
IEventListener() {
+
+ @Override
+ public void eventRaised(Event ev, Object sender, EventArgs args) {
+ model.populateNamespaces();
+ getView().enableGoButton(model.availableNamespaces());
+ }
+ });
+
model.getIsRoleListHiddenModel().getPropertyChangedEvent().addListener(new
IEventListener() {
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java
index da34c81..21ee122 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java
@@ -249,6 +249,10 @@
everyonePanel.setVisible(!indic);
}
+ public void enableGoButton(Boolean value) {
+ searchButton.setEnabled(value);
+ }
+
@Override
public void setMessage(String message) {
super.setMessage(message);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/UiCommandButton.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/UiCommandButton.java
index 65d4c38..358b9fa 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/UiCommandButton.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/UiCommandButton.java
@@ -31,6 +31,10 @@
this("", image); //$NON-NLS-1$
}
+ public void setEnabled(boolean enabled) {
+ button.setEnabled(enabled);
+ }
+
public UiCommandButton(String label, ImageResource image) {
this();
setLabel(label);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
index a280b28..4bdd932 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
@@ -30,7 +30,6 @@
import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
import org.ovirt.engine.ui.uicompat.Event;
import org.ovirt.engine.ui.uicompat.EventArgs;
-import org.ovirt.engine.ui.uicompat.IEventListener;
import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs;
public class AdElementListModel extends SearchableListModel
@@ -194,12 +193,6 @@
@Override
public void onSuccess(Object model, Object result) {
populateProfiles((List<ProfileEntry>) result);
- getProfile().getSelectedItemChangedEvent().addListener(new
IEventListener() {
- @Override
- public void eventRaised(Event ev, Object sender, EventArgs
args) {
- populateNamespaces();
- }
- });
}
}));
@@ -229,9 +222,9 @@
getProfile().setSelectedItem(Linq.firstOrDefault(profiles));
}
- protected void populateNamespaces() {
+ public void populateNamespaces() {
if (namespacesMap != null) {
- getNamespace().setItems(namespacesMap.get(((ProfileEntry)
getProfile().getSelectedItem()).getAuthz()));
+ getNamespace().setItems(getAuthzNamespaces());
}
}
@@ -451,6 +444,10 @@
}
}
+ public boolean availableNamespaces() {
+ return !getAuthzNamespaces().isEmpty();
+ }
+
@Override
protected String getListName() {
return "AdElementListModel"; //$NON-NLS-1$
@@ -475,4 +472,8 @@
return false;
}
+ private List<String> getAuthzNamespaces() {
+ return namespacesMap.get(((ProfileEntry)
getProfile().getSelectedItem()).getAuthz());
+ }
+
}
--
To view, visit http://gerrit.ovirt.org/32213
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4eb1ed2648f3dccc39af9adf409d8c0ec73b2a6f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
