Changeset 2000

Show
Ignore:
Timestamp:
01/01/05 19:53:27 (19 years ago)
Author:
jalet
Message:

Implemented in the LDAP backend code the same fix than in PostgreSQL backend
code for people who don't use PyKota tools to manage accounts.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • pykota/trunk/pykota/storages/ldapstorage.py

    r1998 r2000  
    2222# 
    2323# $Log$ 
     24# Revision 1.94  2005/01/01 18:53:27  jalet 
     25# Implemented in the LDAP backend code the same fix than in PostgreSQL backend 
     26# code for people who don't use PyKota tools to manage accounts. 
     27# 
    2428# Revision 1.93  2004/12/31 16:10:57  jalet 
    2529# Fixed recently introduced bugs due to extended userquotabase and groupquotabase 
     
    639643            if user.LimitBy is not None : 
    640644                user.LimitBy = user.LimitBy[0] 
     645            else :     
     646                user.LimitBy = "quota" 
    641647            result = self.doSearch("(&(objectClass=pykotaAccountBalance)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["balancerdn"], username), ["pykotaBalance", "pykotaLifeTimePaid", "pykotaPayments"], base=self.info["balancebase"]) 
    642648            if not result : 
     
    677683            if group.LimitBy is not None : 
    678684                group.LimitBy = group.LimitBy[0] 
     685            else :     
     686                group.LimitBy = "quota" 
    679687            group.AccountBalance = 0.0 
    680688            group.LifeTimePaid = 0.0 
     
    850858                    if group.LimitBy is not None : 
    851859                        group.LimitBy = group.LimitBy[0] 
     860                    else :     
     861                        group.LimitBy = "quota" 
    852862                    group.AccountBalance = 0.0 
    853863                    group.LifeTimePaid = 0.0