Changeset 804
- Timestamp:
- 02/18/03 00:01:56 (22 years ago)
- Location:
- pykota/trunk/pykota
- Files:
-
- 2 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/config.py
r802 r804 15 15 # 16 16 # $Log$ 17 # Revision 1.16 2003/02/17 23:01:56 jalet 18 # Typos 19 # 17 20 # Revision 1.15 2003/02/17 22:55:01 jalet 18 21 # More options can now be set per printer or globally : 19 22 # 20 # 21 # 22 # 23 # 23 # admin 24 # adminmail 25 # gracedelay 26 # requester 24 27 # 25 28 # the printer option has priority when both are defined. … … 137 140 "storageuser", \ 138 141 ] : 139 backendinfo[option] = self.getGlobalOption( (option)142 backendinfo[option] = self.getGlobalOption(option) 140 143 for option in [ "storageadminpw", "storageuserpw" ] : 141 144 backendinfo[option] = self.getGlobalOption(option, ignore=1) … … 186 189 return self.getPrinterOption(printer, "admin") 187 190 188 def getGraceDelay(self ) :191 def getGraceDelay(self, printer) : 189 192 """Returns the grace delay in days.""" 190 193 gd = self.getPrinterOption(printer, "gracedelay") -
pykota/trunk/pykota/tool.py
r802 r804 15 15 # 16 16 # $Log$ 17 # Revision 1.21 2003/02/17 23:01:56 jalet 18 # Typos 19 # 17 20 # Revision 1.20 2003/02/17 22:55:01 jalet 18 21 # More options can now be set per printer or globally : 19 22 # 20 # 21 # 22 # 23 # 23 # admin 24 # adminmail 25 # gracedelay 26 # requester 24 27 # 25 28 # the printer option has priority when both are defined. … … 253 256 now = DateTime.now() 254 257 if datelimit is None : 255 datelimit = now + self.config.getGraceDelay( )258 datelimit = now + self.config.getGraceDelay(printername) 256 259 self.storage.setDateLimit(username, printername, datelimit) 257 260 if now < datelimit :