gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

introduce new app domains

Browse source 
- generate domains app
- duplicate managemails.models.MailDomain as domains.models.MailDomain
- add domains app to gnuviechadmin.settings.base.LOCAL_APPS
- repair managemails.tests.test_models
- fix handling of empty results in osusers.models.GroupManager.get_next_gid and
  osusers.models.UserManager.get_next_uid
This commit is contained in:
Jan Dittberner 2014-05-25 14:53:58 +02:00
parent e132c9a56c
commit 5db6223bc0
11 changed files with 76 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gnuviechadmin/osusers/models.py
View file

@ -18,6 +18,8 @@ class GroupManager(models.Manager):
def get_next_gid(self):
q = self.aggregate(models.Max('gid'))
if q['gid__max'] is None:
return settings.OSUSER_MINGID
return max(settings.OSUSER_MINGID, q['gid__max'] + 1)
@ -45,6 +47,8 @@ class UserManager(models.Manager):
def get_next_uid(self):
q = self.aggregate(models.Max('uid'))
if q['uid__max'] is None:
return settings.OSUSER_MINUID
return max(settings.OSUSER_MINUID, q['uid__max'] + 1)
def get_next_username(self):