Changeset 3153 for pykota/trunk

Timestamp:

03/12/07 20:46:57 (18 years ago)

Author:

jerome

Message:

Don't ask for confirmation anymore if there's not enough credits
to print.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)
• TODO (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -1105 +1105 @@
         
         if self.Action not in ("DENY", "CANCEL") : 
-            if not self.didUserConfirm() :
-                self.Action = "CANCEL"
-                self.Reason = _("Print job cancelled.")
-                os.environ["PYKOTASTATUS"] = "CANCELLED"
-                
-        if self.Action not in ("DENY", "CANCEL") : 
             if self.Printer.MaxJobSize and (self.softwareJobSize > self.Printer.MaxJobSize) :
                 # This printer was set to refuse jobs this large.
@@ -1164 +1158 @@
                         self.Reason = self.config.getSoftWarn(self.PrinterName)
             
+        # If job still allowed to print, should we ask for confirmation ?    
+        if self.Action not in ("DENY", "CANCEL") : 
+            if not self.didUserConfirm() :
+                self.Action = "CANCEL"
+                self.Reason = _("Print job cancelled.")
+                os.environ["PYKOTASTATUS"] = "CANCELLED"
+                
         # exports some new environment variables
         self.exportReason()

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.26alpha4 (2007-03-12) :
+       
+        - Don't ask for confirmation anymore if there isn't enough credits
+          to print or if the job was already denied for some reason.
+          
     - 1.26alpha3 (2007-01-31) :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.26alpha3_unofficial"
+__version__ = "1.26alpha4_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."

pykota/trunk/TODO

@@ -24 +24 @@
         - --orderby and --order ASC|DESC for dumpykota (or --asc | --desc)
         
-        - Don't ask for confirmation if the job will be rejected anyway
-          because of insufficient credits.
-          
         - Document the PYKOTA_HOME environment variable.