Changeset 3153 for pykota/trunk/bin

Timestamp:

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

Author:

jerome

Message:

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

Files:

• pykota/trunk/bin/cupspykota (modified) (2 diffs)

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()