Hello Yair Zaslavsky,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/30746
to review the following change.
Change subject: aaa: Fix "directory group" sub tab
......................................................................
aaa: Fix "directory group" sub tab
Some changes were made to the directory group sub tab
of users:
1. Organizational unit is removed, as relevant for ldap providers, and
engine/ui should be agnostic to provider type
2. namespace is introduced , same as in other places in ui
(for example at the add user/group dialog).
Topic: AAA
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720
Change-Id: I2125c11f60576d9c2fd9fa3d2771cb34145cccc2
Signed-off-by: Yair Zaslavsky <[email protected]>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/comparators/UserGroupComparator.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroup.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroupListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
5 files changed, 42 insertions(+), 54 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/30746/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/comparators/UserGroupComparator.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/comparators/UserGroupComparator.java
index d0f0164..f491186 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/comparators/UserGroupComparator.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/comparators/UserGroupComparator.java
@@ -19,22 +19,22 @@
};
/**
- * Comparator for the organizational unit field in {@code UserGroup}.
+ * Comparator for the namespace field in {@code UserGroup}.
*/
- public static final Comparator<UserGroup> ORG_UNIT = new
Comparator<UserGroup>() {
+ public static final Comparator<UserGroup> NAMESPACE = new
Comparator<UserGroup>() {
@Override
public int compare(UserGroup userGroup1, UserGroup userGroup2) {
- return lexoNumeric.compare(userGroup1.getOrganizationalUnit(),
userGroup2.getOrganizationalUnit());
+ return lexoNumeric.compare(userGroup1.getNamespace(),
userGroup2.getNamespace());
}
};
/**
- * Comparator for the group name field in {@code UserGroup}.
+ * Comparator for the authorization provider (authz) field in {@code
UserGroup}.
*/
- public static final Comparator<UserGroup> DOMAIN = new
Comparator<UserGroup>() {
+ public static final Comparator<UserGroup> AUTHZ = new
Comparator<UserGroup>() {
@Override
public int compare(UserGroup userGroup1, UserGroup userGroup2) {
- return lexoNumeric.compare(userGroup1.getDomain(),
userGroup2.getDomain());
+ return lexoNumeric.compare(userGroup1.getAuthz(),
userGroup2.getAuthz());
}
};
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroup.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroup.java
index aae4395..c179577 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroup.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroup.java
@@ -3,39 +3,35 @@
@SuppressWarnings("unused")
public class UserGroup
{
- private String privateGroupName;
+ private String groupName;
+ private String authz;
+ private String namespace;
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
public String getGroupName()
{
- return privateGroupName;
+ return groupName;
}
public void setGroupName(String value)
{
- privateGroupName = value;
+ groupName = value;
}
- private String privateOrganizationalUnit;
-
- public String getOrganizationalUnit()
+ public String getAuthz()
{
- return privateOrganizationalUnit;
+ return authz;
}
- public void setOrganizationalUnit(String value)
+ public void setAuthz(String value)
{
- privateOrganizationalUnit = value;
- }
-
- private String privateDomain;
-
- public String getDomain()
- {
- return privateDomain;
- }
-
- public void setDomain(String value)
- {
- privateDomain = value;
+ authz = value;
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroupListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroupListModel.java
index 1027875..0814aa3 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroupListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserGroupListModel.java
@@ -39,7 +39,7 @@
ArrayList<UserGroup> items = new ArrayList<UserGroup>();
for (String groupFullName : getEntity().getGroupNames())
{
- items.add(createUserGroup(groupFullName));
+ items.add(createUserGroup(groupFullName,
getEntity().getNamespace(), getEntity().getDomain()));
}
setItems(items);
@@ -50,21 +50,12 @@
}
}
- private static UserGroup createUserGroup(String groupFullName)
+ private UserGroup createUserGroup(String groupFullName, String namespace,
String authz)
{
- // Parse 'groupFullName' (representation:
Domain/OrganizationalUnit/Group)
- int firstIndexOfSlash = groupFullName.indexOf('/');
- int lastIndexOfSlash = groupFullName.lastIndexOf('/');
- String domain = firstIndexOfSlash >= 0 ? groupFullName.substring(0,
firstIndexOfSlash) : ""; //$NON-NLS-1$
- String groupName = lastIndexOfSlash >= 0 ?
groupFullName.substring(lastIndexOfSlash + 1) : ""; //$NON-NLS-1$
- String organizationalUnit =
- lastIndexOfSlash > firstIndexOfSlash ?
groupFullName.substring(0, lastIndexOfSlash)
- .substring(firstIndexOfSlash + 1) : ""; //$NON-NLS-1$
-
UserGroup tempVar = new UserGroup();
- tempVar.setGroupName(groupName);
- tempVar.setOrganizationalUnit(organizationalUnit);
- tempVar.setDomain(domain);
+ tempVar.setGroupName(groupFullName);
+ tempVar.setNamespace(namespace);
+ tempVar.setAuthz(authz);
return tempVar;
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index 1f3d289..587e1de 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -2237,11 +2237,11 @@
@DefaultStringValue("Group Name")
String groupNameGroup();
- @DefaultStringValue("Organizational Unit")
- String orgUnitGroup();
+ @DefaultStringValue("Namespace")
+ String namespaceGroup();
- @DefaultStringValue("Domain")
- String domainGroup();
+ @DefaultStringValue("Authorization provider")
+ String authzGroup();
// Event notifier
@DefaultStringValue("Event Name")
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
index 6b4aaa1..e0eacdb 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGroupView.java
@@ -24,6 +24,7 @@
}
void initTable(ApplicationConstants constants) {
+ getTable().enableColumnResizing();
TextColumnWithTooltip<UserGroup> nameColumn = new
TextColumnWithTooltip<UserGroup>() {
@Override
public String getValue(UserGroup object) {
@@ -31,25 +32,25 @@
}
};
nameColumn.makeSortable(UserGroupComparator.NAME);
- getTable().addColumn(nameColumn, constants.groupNameGroup());
+ getTable().addColumn(nameColumn, constants.groupNameGroup(), "300px");
//$NON-NLS-1$
- TextColumnWithTooltip<UserGroup> orgUnitColumn = new
TextColumnWithTooltip<UserGroup>() {
+ TextColumnWithTooltip<UserGroup> namespaceColumn = new
TextColumnWithTooltip<UserGroup>() {
@Override
public String getValue(UserGroup object) {
- return object.getOrganizationalUnit();
+ return object.getNamespace();
}
};
- orgUnitColumn.makeSortable(UserGroupComparator.ORG_UNIT);
- getTable().addColumn(orgUnitColumn, constants.orgUnitGroup());
+ namespaceColumn.makeSortable(UserGroupComparator.NAMESPACE);
+ getTable().addColumn(namespaceColumn, constants.namespaceGroup(),
"300px"); //$NON-NLS-1$
- TextColumnWithTooltip<UserGroup> domainColumn = new
TextColumnWithTooltip<UserGroup>() {
+ TextColumnWithTooltip<UserGroup> authzColumn = new
TextColumnWithTooltip<UserGroup>() {
@Override
public String getValue(UserGroup object) {
- return object.getDomain();
+ return object.getAuthz();
}
};
- domainColumn.makeSortable(UserGroupComparator.DOMAIN);
- getTable().addColumn(domainColumn, constants.domainGroup());
+ authzColumn.makeSortable(UserGroupComparator.AUTHZ);
+ getTable().addColumn(authzColumn, constants.authzGroup(), "300px");
//$NON-NLS-1$
}
}
--
To view, visit http://gerrit.ovirt.org/30746
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2125c11f60576d9c2fd9fa3d2771cb34145cccc2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Yair Zaslavsky <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
