Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Fix principal presentation at UI ......................................................................
aaa: Fix principal presentation at UI Change-Id: Ie7b79325f7c6a2da0300e2a253b15044113a4b3f Topic: AAA Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java 5 files changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/32475/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java index 9c891de..46689c9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java @@ -150,7 +150,8 @@ authzName, principalRecord.<String> get(Authz.PrincipalRecord.NAMESPACE), principalRecord.<String> get(Authz.PrincipalRecord.ID), - principalRecord.<String> get(Authz.PrincipalRecord.NAME) + principalRecord.<String> get(Authz.PrincipalRecord.NAME), + principalRecord.<String> get(Authz.PrincipalRecord.PRINCIPAL) ); directoryUser.setDepartment(principalRecord.<String> get(Authz.PrincipalRecord.DEPARTMENT)); directoryUser.setFirstName(principalRecord.<String> get(Authz.PrincipalRecord.FIRST_NAME)); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java index 8b14f16..7d6de24 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java @@ -16,9 +16,10 @@ // Flag indicating if this user has the administrator role: private boolean isAdmin; - public DirectoryUser(String directoryName, String namespace, String id, String name) { + public DirectoryUser(String directoryName, String namespace, String id, String name, String principal) { super(directoryName, namespace, id, name); isAdmin = false; + this.principal = principal; } public String getFirstName() { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java index d3903e7..e9e8079 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java @@ -78,6 +78,7 @@ protected DirectoryUser getEntity(int index) { return new DirectoryUser(DOMAIN, NAMESPACE, DirectoryEntryIdUtils.decode(EXTERNAL_IDS[index]), + NAMES[index], NAMES[index]); } } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java index 84d20ea..baa8a15 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java @@ -220,7 +220,7 @@ } private DirectoryUser getDirectoryUser(int index) { - return new DirectoryUser(DOMAIN, NAMESPACE, EXTERNAL_IDS[index], NAMES[index]); + return new DirectoryUser(DOMAIN, NAMESPACE, EXTERNAL_IDS[index], NAMES[index], NAMES[index]); } @Override diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java index 59ddf68..b0dd5df 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java @@ -15,7 +15,8 @@ String namespace = reader.readString(); String id = reader.readString(); String name = reader.readString(); - return new DirectoryUser(directoryName, namespace, id, name); + String principal = reader.readString(); + return new DirectoryUser(directoryName, namespace, id, name, principal); } public static void serialize(SerializationStreamWriter writer, DirectoryUser user) throws SerializationException { @@ -23,6 +24,7 @@ writer.writeObject(user.getNamespace()); writer.writeObject(user.getId()); writer.writeString(user.getName()); + writer.writeString(user.getPrincipal()); writer.writeBoolean(user.isAdmin()); writer.writeString(user.getDepartment()); writer.writeString(user.getEmail()); -- To view, visit http://gerrit.ovirt.org/32475 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7b79325f7c6a2da0300e2a253b15044113a4b3f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
