[Engine-patches] Change in ovirt-engine[master]: aaa: Fix principal presentation at UI

[yzaslavs]

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 <yzasl...@redhat.com>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
M 
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
2 files changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/32445/1

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..d87d25e 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,14 @@
     // 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 DirectoryUser(String directoryName, String namespace, String id, 
String name) {
+        this(directoryName, namespace, id, name, null);
     }
 
     public String getFirstName() {
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/32445
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7b79325f7c6a2da0300e2a253b15044113a4b3f
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