Changeset 1062 for pykota/trunk

Timestamp:

07/05/03 09:46:50 (21 years ago)

Author:

jalet

Message:

The previous bug fix was incomplete.

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/reporters/text.py (modified) (2 diffs)
• pykota/storage.py (modified) (3 diffs)
• pykota/storages/ldapstorage.py (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.12alpha2 :
+    
+        - The previous bug fix was incomplete. This is corrected.
+        
     - 1.12alpha1 :
     

pykota/trunk/pykota/reporters/text.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.3  2003/07/05 07:46:50  jalet
+# The previous bug fix was incomplete.
+#
 # Revision 1.2  2003/07/02 09:29:12  jalet
 # Bug fixed when wanting a report and an user/group was limited by account balance
@@ -84 +87 @@
         lifetimepaid = float(entry.LifeTimePaid or 0.0)
         
-        if entry.LimitBy.lower() == "balance" :    
+        if entry.LimitBy and (entry.LimitBy.lower() == "balance") :    
             if balance <= 0 :
                 datelimit = "DENY"

pykota/trunk/pykota/storage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.17  2003/07/05 07:46:50  jalet
+# The previous bug fix was incomplete.
+#
 # Revision 1.16  2003/06/25 19:52:31  jalet
 # Should be ready for testing :-)
@@ -124 +127 @@
     def setLimitBy(self, limitby) :    
         """Sets the user's limiting factor."""
-        limitby = limitby.lower()
+        try :
+            limitby = limitby.lower()
+        except AttributeError :    
+            limitby = "quota"
         if limitby in ["quota", "balance"] :
             self.parent.writeUserLimitBy(self, limitby)
@@ -151 +157 @@
     def setLimitBy(self, limitby) :    
         """Sets the user's limiting factor."""
-        limitby = limitby.lower()
+        try :
+            limitby = limitby.lower()
+        except AttributeError :    
+            limitby = "quota"
         if limitby in ["quota", "balance"] :
             self.parent.writeGroupLimitBy(self, limitby)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.13  2003/07/05 07:46:50  jalet
+# The previous bug fix was incomplete.
+#
 # Revision 1.12  2003/06/30 13:54:21  jalet
 # Sorts by user / group name
@@ -188 +191 @@
             fields = result[0][1]
             user.ident = result[0][0]
-            user.LimitBy = fields.get("pykotaLimitBy")[0]
+            user.LimitBy = fields.get("pykotaLimitBy")
+            if user.LimitBy is not None :
+                user.LimitBy = user.LimitBy[0]
             result = self.doSearch("(&(objectClass=pykotaAccountBalance)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["balancerdn"], username), ["pykotaBalance", "pykotaLifeTimePaid"], base=self.info["balancebase"])
             if result :
@@ -217 +222 @@
             fields = result[0][1]
             group.ident = result[0][0]
-            group.LimitBy = fields.get("pykotaLimitBy")[0]
+            group.LimitBy = fields.get("pykotaLimitBy")
+            if group.LimitBy is not None :
+                group.LimitBy = group.LimitBy[0]
             group.AccountBalance = 0.0
             group.LifeTimePaid = 0.0

pykota/trunk/pykota/version.py

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