[mango/django] Port it to django trunk

[Olav Vitters <ovitters src gnome org>]

commit 243c12779e6af797b1cf864fc09586224f05d93e
Author: Olav Vitters <olav bkor dhs org>
Date:   Sat Jul 18 21:24:33 2009 +0200

    Port it to django trunk

 mango/models.py   |    6 ++----
 mango/settings.py |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/mango/models.py b/mango/models.py
index 3321626..c9be343 100644
--- a/mango/models.py
+++ b/mango/models.py
@@ -9,8 +9,7 @@
 
 from django.db import models
 from django.conf import settings
-from django.core import validators
-from django.newforms import ModelForm, BaseModelForm, BooleanField
+from django.forms import ModelForm, BaseModelForm, BooleanField
 from django.utils import tree
 from django.db.models import Q
 import ldap
@@ -40,8 +39,7 @@ class AccountsForm(ModelForm):
 class AccountGroups(models.Model):
     id = models.AutoField(primary_key=True)
     request = models.ForeignKey(AccountRequest)
-    cn = models.CharField(max_length=15,validator_list=[validators.isOnlyLetters,
-                                                        validators.isLowerCase])
+    cn = models.CharField(max_length=15)
     voucher_group = models.CharField(max_length=50, blank=True, null=True)
     verdict = models.CharField(max_length=1, default='P', editable=False)
     voucher = models.CharField(max_length=15, blank=True, null=True)
diff --git a/mango/settings.py b/mango/settings.py
index b1df310..9837160 100644
--- a/mango/settings.py
+++ b/mango/settings.py
@@ -24,7 +24,7 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 TIME_ZONE = 'UTC'
 
 
-SITE_ROOT = r'mango/django/'
+SITE_ROOT = r'mango/'
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
@@ -142,5 +142,5 @@ for f in cfg_files:
         
         break
 
-MANGO_CFG['base_url'] = 'http://localhost/mango/django'
+MANGO_CFG['base_url'] = 'http://localhost/mango'