Changeset 2701

Timestamp:

02/16/06 21:24:39 (19 years ago)

Author:

jerome

Message:

Option --list now works for pkusers.

Files:

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

pykota/trunk/bin/pkusers

@@ -195 +195 @@
                         
             if options["list"] :
-                for entry in entries :
-                    print "%s - <%s>" % (entry.Name, entry.Email)
+                if suffix == "User" :
+                    maildomain = self.config.getMailDomain()
+                    smtpserver = self.config.getSMTPServer()
+                    for entry in entries :
+                        email = entry.Email
+                        if not email :
+                            if maildomain :     
+                                email = "%s@%s" % (entry.Name, maildomain)
+                            elif smtpserver :    
+                                email = "%s@%s" % (entry.Name, smtpserver)
+                            else :    
+                                email = "%s@%s" % (entry.Name, "localhost")
+                        msg = "%s - <%s>" % (entry.Name, email)
+                        if entry.Description :
+                            msg += " - %s" % entry.Description
+                        print msg    
+                        print "    %s" % (_("Limited by : %s") % entry.LimitBy)
+                        print "    %s" % (_("Account balance : %.2f") % (entry.AccountBalance or 0.0))
+                        print "    %s" % (_("Total paid so far : %.2f") % (entry.LifeTimePaid or 0.0))
+                        print "    %s" % (_("Overcharging factor : %.2f") % entry.OverCharge)
+                else :    
+                    for entry in entries :
+                        msg = "%s" % entry.Name
+                        if entry.Description :
+                            msg += " - %s" % entry.Description
+                        print msg    
+                        print "    %s" % (_("Limited by : %s") % entry.LimitBy)
+                        print "    %s" % (_("Group balance : %.2f") % (entry.AccountBalance or 0.0))
+                        print "    %s" % (_("Total paid so far : %.2f") % (entry.LifeTimePaid or 0.0))
             else :
                 self.display("%s...\n" % _("Modification"))
@@ -312 +339 @@
         elif (options["delete"] and (options["add"] or options["groups"] or options["remove"] or options["description"])) \
            or (options["skipexisting"] and not options["add"]) \
-           or (options["list"] and (options["add"] or options["delete"] or options["groups"] or options["remove"] or options["description"])) \
+           or (options["list"] and (options["add"] or options["delete"] or options["remove"] or options["description"])) \
            or (options["groups"] and (options["balance"] or options["ingroups"] or options["overcharge"])) :
             raise PyKotaCommandLineError, _("incompatible options, see help.")