Changeset 1067 for pykota/trunk

Timestamp:

07/07/03 10:33:19 (21 years ago)

Author:

jalet

Message:

Bug fix due to a typo in LDAP code

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (2 diffs)
• pykota/storages/ldapstorage.py (modified) (2 diffs)
• pykota/storages/pgstorage.py (modified) (4 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.13alpha1 :
+    
+        - Bug fix wrt LDAP.
+        
     - 1.12 :
     

pykota/trunk/pykota/storage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.18  2003/07/07 08:33:18  jalet
+# Bug fix due to a typo in LDAP code
+#
 # Revision 1.17  2003/07/05 07:46:50  jalet
 # The previous bug fix was incomplete.
@@ -112 +115 @@
         self.AccountBalance = None
         self.LifeTimePaid = None
+        self.Email = None
         
     def consumeAccountBalance(self, amount) :     

pykota/trunk/pykota/storages/ldapstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.14  2003/07/07 08:33:18  jalet
+# Bug fix due to a typo in LDAP code
+#
 # Revision 1.13  2003/07/05 07:46:50  jalet
 # The previous bug fix was incomplete.
@@ -595 +598 @@
         else :    
             lastjuuid = self.genUUID()
-            lastjdn = "cn=%s,%s" % (lasjuuid, self.info["lastjobbase"])
+            lastjdn = "cn=%s,%s" % (lastjuuid, self.info["lastjobbase"])
             fields = {
                        "objectClass" : ["pykotaObject", "pykotaLastJob"],

pykota/trunk/pykota/storages/pgstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.5  2003/07/07 08:33:19  jalet
+# Bug fix due to a typo in LDAP code
+#
 # Revision 1.4  2003/06/30 13:54:21  jalet
 # Sorts by user / group name
@@ -144 +147 @@
             user.AccountBalance = fields.get("balance")
             user.LifeTimePaid = fields.get("lifetimepaid")
+            user.Email = fields.get("email")
             user.Exists = 1
         return user
@@ -196 +200 @@
                 user.AccountBalance = record.get("balance")
                 user.LifeTimePaid = record.get("lifetimepaid")
+                user.Email = record.get("email")
                 user.Exists = 1
                 groupmembers.append(user)
@@ -282 +287 @@
                     user.AccountBalance = record.get("balance")
                     user.LifeTimePaid = record.get("lifetimepaid")
+                    user.Email = record.get("email")    # TODO : Always None here
                     user.Exists = 1
                     userpquota = StorageUserPQuota(self, user, printer)

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.12_unofficial"
+__version__ = "1.13alpha1_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""