From 538b8c8a3594cb27498237d92673c11abaabb383 Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Tue, 16 Sep 2014 12:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9model=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/AutoSa/Assets/models.py | 1 + webroot/AutoSa/UserManage/models.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/webroot/AutoSa/Assets/models.py b/webroot/AutoSa/Assets/models.py index 49d3a309b..50dbe37c1 100644 --- a/webroot/AutoSa/Assets/models.py +++ b/webroot/AutoSa/Assets/models.py @@ -6,6 +6,7 @@ class Assets(models.Model): id = models.AutoField(primary_key=True) ip = models.CharField(max_length=20) port = models.IntegerField(max_length=5) + idc = models.CharField(max_length=50) comment = models.CharField(max_length=100, blank=True, null=True) def __unicode__(self): diff --git a/webroot/AutoSa/UserManage/models.py b/webroot/AutoSa/UserManage/models.py index e57b13fa5..733a3074e 100644 --- a/webroot/AutoSa/UserManage/models.py +++ b/webroot/AutoSa/UserManage/models.py @@ -5,7 +5,18 @@ class User(models.Model): username = models.CharField(max_length=50) password = models.CharField(max_length=100) name = models.CharField(max_length=50) - email = models.EmailField(max_length=50) + group = models.ManyToManyField(Group) + is_admin = models.BooleanField() + is_superuser = models.BooleanField() + ldap_password = models.CharField(max_length=100, null=False) + email = models.EmailField(max_length=50, null=True, blank=True) def __unicode__(self): - return self.username \ No newline at end of file + return self.username + + +class Group(models.Model): + name = models.CharField(max_length=50) + + def __unicode__(self): + return self.name \ No newline at end of file