Adds manager and direct reports to usershow page.

Fixes a bug with the group by member where is wasn't trapping not found errors.

2 files changed, 26 insertions, 0 deletions

diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py
index 6fbd41d58..3093fa976 100644
--- a/ipa-python/ipaclient.py
+++ b/ipa-python/ipaclient.py
@@ -68,6 +68,15 @@ class IPAClient:
         result = self.transport.get_user_by_dn(dn,sattrs)
         return user.User(result)
 
+    def get_users_by_manager(self,manager_dn,sattrs=None):
+        """Gets the users the report to a particular manager.
+           If sattrs is not None then only those
+           attributes will be returned, otherwise all available
+           attributes are returned. The result is a list of groups."""
+        results = self.transport.get_users_by_manager(manager_dn, sattrs)
+
+        return map(lambda result: user.User(result), results)
+
     def add_user(self,user,user_container=None):
         """Add a user. user is a ipa.user.User object"""
 
diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py
index c662761cf..9d9990448 100644
--- a/ipa-python/rpcclient.py
+++ b/ipa-python/rpcclient.py
@@ -101,6 +101,23 @@ class RPCClient:
 
         return ipautil.unwrap_binary_data(result)
 
+    def get_users_by_manager(self,manager_dn,sattrs=None):
+        """Gets the users that report to a manager.
+           If sattrs is not None then only those
+           attributes will be returned, otherwise all available
+           attributes are returned. The result is a list of dicts."""
+        server = self.setup_server()
+        if sattrs is None:
+            sattrs = "__NONE__"
+        try:
+            result = server.get_users_by_manager(manager_dn, sattrs)
+        except xmlrpclib.Fault, fault:
+            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
+        except socket.error, (value, msg):
+            raise xmlrpclib.Fault(value, msg)
+
+        return ipautil.unwrap_binary_data(result)
+
     def add_user(self,user,user_container=None):
         """Add a new user. Takes as input a dict where the key is the
            attribute name and the value is either a string or in the case