X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fmodels%2Fuser.py;h=c8df8362baeda37ddd72bfda15cbc2caf5c06ca6;hb=fb4b29a51e5215f0313232e7093a70a1013651e1;hp=5a73ad77719a0bbba7bf6cbf3b047e5e0813f9fd;hpb=e3c1443a080a80b287c7d2b3baca902817d31d73;p=plstackapi.git diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py index 5a73ad7..c8df836 100644 --- a/planetstack/core/models/user.py +++ b/planetstack/core/models/user.py @@ -1,10 +1,12 @@ import os import datetime +import sys +import hashlib from collections import defaultdict +from django.forms.models import model_to_dict from django.db import models from django.db.models import F, Q from core.models import PlCoreBase,Site, DashboardView, DiffModelMixIn -from core.models.site import Deployment from django.contrib.auth.models import AbstractBaseUser, BaseUserManager from timezones.fields import TimeZoneField from operator import itemgetter, attrgetter @@ -13,6 +15,20 @@ from core.middleware import get_request import model_policy from django.core.exceptions import PermissionDenied +# ------ from plcorebase.py ------ +try: + # This is a no-op if observer_disabled is set to 1 in the config file + from observer import * +except: + print >> sys.stderr, "import of observer failed! printing traceback and disabling observer:" + import traceback + traceback.print_exc() + + # guard against something failing + def notify_observer(*args, **kwargs): + pass +# ------ ------ + # Create your models here. class UserManager(BaseUserManager): def create_user(self, email, firstname, lastname, password=None): @@ -48,6 +64,17 @@ class UserManager(BaseUserManager): user.save(using=self._db) return user + def get_queryset(self): + parent=super(UserManager, self) + if hasattr(parent, "get_queryset"): + return parent.get_queryset().filter(deleted=False) + else: + return parent.get_query_set().filter(deleted=False) + + # deprecated in django 1.7 in favor of get_queryset(). + def get_query_set(self): + return self.get_queryset() + class DeletedUserManager(UserManager): def get_queryset(self): return super(UserManager, self).get_query_set().filter(deleted=True) @@ -56,7 +83,56 @@ class DeletedUserManager(UserManager): def get_query_set(self): return self.get_queryset() -class User(AbstractBaseUser, DiffModelMixIn): +class User(AbstractBaseUser): #, DiffModelMixIn): + + # ---- copy stuff from DiffModelMixin ---- + + @property + def _dict(self): + return model_to_dict(self, fields=[field.name for field in + self._meta.fields]) + + @property + def diff(self): + d1 = self._initial + d2 = self._dict + diffs = [(k, (v, d2[k])) for k, v in d1.items() if v != d2[k]] + return dict(diffs) + + @property + def has_changed(self): + return bool(self.diff) + + @property + def changed_fields(self): + return self.diff.keys() + + def has_field_changed(self, field_name): + return field_name in self.diff.keys() + + def get_field_diff(self, field_name): + return self.diff.get(field_name, None) + + #classmethod + def getValidators(cls): + """ primarily for REST API, return a dictionary of field names mapped + to lists of the type of validations that need to be applied to + those fields. + """ + validators = {} + for field in cls._meta.fields: + l = [] + if field.blank==False: + l.append("notBlank") + if field.__class__.__name__=="URLField": + l.append("url") + validators[field.name] = l + return validators + # ---- end copy stuff from DiffModelMixin ---- + + @property + def remote_password(self): + return hashlib.md5(self.password).hexdigest()[:12] class Meta: app_label = "core" @@ -79,13 +155,15 @@ class User(AbstractBaseUser, DiffModelMixIn): public_key = models.TextField(null=True, blank=True, max_length=1024, help_text="Public key string") is_active = models.BooleanField(default=True) - is_admin = models.BooleanField(default=True) + is_admin = models.BooleanField(default=False) is_staff = models.BooleanField(default=True) is_readonly = models.BooleanField(default=False) + is_registering = models.BooleanField(default=False) created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) enacted = models.DateTimeField(null=True, default=None) + policed = models.DateTimeField(null=True, default=None) backend_status = models.CharField(max_length=140, default="Provisioning in progress") deleted = models.BooleanField(default=False) @@ -121,6 +199,8 @@ class User(AbstractBaseUser, DiffModelMixIn): def delete(self, *args, **kwds): # so we have something to give the observer purge = kwds.get('purge',False) + if purge: + del kwds['purge'] try: purge = purge or observer_disabled except NameError: @@ -156,7 +236,7 @@ class User(AbstractBaseUser, DiffModelMixIn): def get_dashboards(self): DEFAULT_DASHBOARDS=["Tenant"] - dashboards = sorted(list(self.dashboardViews.all()), key=attrgetter('order')) + dashboards = sorted(list(self.userdashboardviews.all()), key=attrgetter('order')) dashboards = [x.dashboardView for x in dashboards] if not dashboards: @@ -183,9 +263,10 @@ class User(AbstractBaseUser, DiffModelMixIn): def save(self, *args, **kwds): if not self.id: self.set_password(self.password) - if self.is_active: - if self.password=="!": - self.send_temporary_password() + print "XXX", self, self.is_active, self.is_registering + if self.is_active and self.is_registering: + self.send_temporary_password() + self.is_registering=False self.username = self.email super(User, self).save(*args, **kwds) @@ -258,6 +339,6 @@ class User(AbstractBaseUser, DiffModelMixIn): self.delete(*args, **kwds) class UserDashboardView(PlCoreBase): - user = models.ForeignKey(User, related_name="dashboardViews") - dashboardView = models.ForeignKey(DashboardView, related_name="dashboardViews") + user = models.ForeignKey(User, related_name='userdashboardviews') + dashboardView = models.ForeignKey(DashboardView, related_name='userdashboardviews') order = models.IntegerField(default=0)