Fix TTL conversion for um.User and um.Group.

diff --git a/rsbac/um.py b/rsbac/um.py
index 12bbb8a..ecf4b9e 100644 (file)
--- a/rsbac/um.py
+++ b/rsbac/um.py
@@ -737,9 +737,9 @@ class UserBase( object ) :
     # TTL
     #
     def getTtl( self ) :
-        return getUserTtl( self.id )
+        return intToTtl( getUserTtl( self.id ) )
     def setTtl( self , ttl ) :
-        return setUserTtl( self.id , ttl )
+        return setUserTtl( self.id , ttlToInt( ttl ) )
     ttl = property( getTtl , setTtl )
     #
     # groups
@@ -834,17 +834,11 @@ class Group( object ) :
     # TTL
     #
     def getTtl( self ) :
-        return getGroupTtl( self.id )
+        return intToTtl( getGroupTtl( self.id ) )
     def setTtl( self , ttl ) :
-        return setGroupTtl( self.id , ttl )
+        return setGroupTtl( self.id , ttlToInt( ttl ) )
     ttl = property( getTtl , setTtl )
     #
-    # Extra members
-    #
-    def getExtraMembers( self ) :
-        return tuple( map( User , getGroupsUserList( self.id ) ) )
-    extraMembers = property( getExtraMembers )
-    #
     # Members
     #
     def getMembers( self ) :
@@ -852,6 +846,12 @@ class Group( object ) :
                         if getUserGroup( uid ) == self.id ] )
     members = property( getMembers )
     #
+    # Extra members
+    #
+    def getExtraMembers( self ) :
+        return tuple( map( User , getGroupsUserList( self.id ) ) )
+    extraMembers = property( getExtraMembers )
+    #
     # exists
     #
     def getExists( self ) :