Changeset 927 for pykota/trunk/bin/edpykota

Timestamp:

04/16/03 14:35:49 (21 years ago)

Author:

jalet

Message:

Groups quota work now !

Files:

• pykota/trunk/bin/edpykota (modified) (6 diffs)

pykota/trunk/bin/edpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.41  2003/04/16 12:35:49  jalet
+# Groups quota work now !
+#
 # Revision 1.40  2003/04/16 08:22:09  jalet
 # More strict error detection.
@@ -340 +343 @@
         if not names :    
             if options["add"] and not printeradded :
-                raise PyKotaToolError, _("You have to pass user names on the command line")
+                raise PyKotaToolError, _("You have to pass user or group names on the command line")
             else :    
                 names = [ "*" ] # all users
@@ -366 +369 @@
         if limitby and (limitby not in ('quota', 'balance')) :    
             raise PyKotaToolError, _("Invalid limitby value %s" % options["limitby"])
+            
+        if options["ingroups"] :    
+            groupnames = [gname.strip() for gname in options["ingroups"].split(',')]
+        else :    
+            groupnames = []
             
         for (printerid, printer) in printers :
@@ -393 +401 @@
                 if softlimit is not None :
                     self.logger.log_message(_("Undefined soft limit set to hard limit (%s) on printer %s.") % (str(softlimit), printer))
-            if (not options["reset"] and not options["noquota"] and not options["prototype"] and not options["limitby"] and not options["balance"] and not options["delete"] and not options["charge"]) and ((hardlimit is None) or (softlimit is None)) :
+            if (not options["ingroups"] and not options["reset"] and not options["noquota"] and not options["prototype"] and not options["limitby"] and not options["balance"] and not options["delete"] and not options["charge"]) and ((hardlimit is None) or (softlimit is None)) :
                 raise PyKotaToolError, _("Both hard and soft limits must be set ! Aborting.")
             if options["add"] :    
@@ -458 +466 @@
                                 else :
                                     self.storage.setUserBalance(ident, balancevalue)
+                            for groupname in groupnames :        
+                                groupid = self.storage.getGroupId(groupname)
+                                if groupid is not None :
+                                    self.storage.addUserToGroup(ident, groupid)
                             self.warnUserPQuota(name, printer)    
                      
@@ -506 +518 @@
         elif options["groups"] and (options["balance"] or options["ingroups"]) :
             raise PyKotaToolError, _("incompatible options, see help.")
-        elif options["groups"] :    
-            raise PyKotaToolError, _("option --groups is currently not implemented.")
         else :
             sys.exit(editor.main(args, options))