Changeset 2718

Timestamp:

02/20/06 22:29:28 (18 years ago)

Author:

jerome

Message:

Fixed deletion code for print quota entries.

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (1 diff)
• sql.py (modified) (2 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1414 +1414 @@
         for (ident, fields) in result :
             self.doDelete(ident)
+        if upquota.Printer.LastJob.UserName == upquota.User.Name :
+            self.doDelete(upquota.Printer.LastJob.lastjobident)
         self.doDelete(upquota.ident)
         

pykota/trunk/pykota/storages/sql.py

@@ -745 +745 @@
         """Completely deletes an user print quota entry from the database."""
         for q in [ 
-                    "DELETE FROM jobhistory WHERE userid=%s" % self.doQuote(upquota.User.ident),
-                    "DELETE FROM userpquota WHERE userid=%s" % self.doQuote(upquota.ident),
+                    "DELETE FROM jobhistory WHERE userid=%s AND printerid=%s" \
+                                 % (self.doQuote(upquota.User.ident), self.doQuote(upquota.Printer.ident)),
+                    "DELETE FROM userpquota WHERE id=%s" % self.doQuote(upquota.ident),
                   ] :
             self.doModify(q)
@@ -753 +754 @@
         """Completely deletes a group print quota entry from the database."""
         for q in [ 
-                    "DELETE FROM grouppquota WHERE groupid=%s" % self.doQuote(gpquota.ident),
+                    "DELETE FROM grouppquota WHERE id=%s" % self.doQuote(gpquota.ident),
                   ] :
             self.doModify(q)