not work get_or_create defauls, refactor this

prod
Dmitriy Shesterkin 9 years ago
parent 1c5d5dfa47
commit 38b719600d
  1. 2
      Makefile
  2. 2
      conf/supervisor.conf
  3. 9
      src/customer/tasks.py
  4. 3
      src/myauth/admin.py
  5. 12
      src/myauth/managers.py

@ -68,4 +68,4 @@ clean: clean_temp clean_venv clean_db
# target: worker - Run celery worker # target: worker - Run celery worker
worker: worker:
cd src && celery -A dokumentor worker -l info -E cd src && celery -A dokumentor worker -l info -E -B

@ -27,7 +27,7 @@ stderr_events_enabled=true
autorestart=true autorestart=true
[program:celeryd] [program:celeryd]
command=celery -A dokumentor worker -l info -E command=celery -A dokumentor worker -l info -E -B
directory=/opt/app/src directory=/opt/app/src
stdout_logfile=/var/log/celery-worker.log stdout_logfile=/var/log/celery-worker.log
stderr_logfile=/var/log/celery-worker.log stderr_logfile=/var/log/celery-worker.log

@ -7,6 +7,9 @@ import traceback
from django.core.mail import mail_admins from django.core.mail import mail_admins
from celery import shared_task from celery import shared_task
from myauth.models import DokUser, ConfirmEmail
from .models import License, UserProfile from .models import License, UserProfile
from .utils import check_one_profile from .utils import check_one_profile
@ -33,3 +36,9 @@ def check_license():
) )
return None return None
def check_not_activated_users():
profiles = UserProfile.objects.filter(active=False, confirmed=False)
users = DokUser.objects.filter(profile__active=False, profile__confirmed=False)
confirms = ConfirmEmail.objects.filter(is_confirmed=False)

@ -3,7 +3,7 @@ from django.contrib import admin
from django.contrib.auth.admin import UserAdmin from django.contrib.auth.admin import UserAdmin
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from myauth.models import DokUser from myauth.models import DokUser, ConfirmEmail
from myauth.forms import CustomUserChangeForm, CustomUserCreationForm from myauth.forms import CustomUserChangeForm, CustomUserCreationForm
@ -33,3 +33,4 @@ class CustomUserAdmin(UserAdmin):
ordering = ('email',) ordering = ('email',)
admin.site.register(DokUser, CustomUserAdmin) admin.site.register(DokUser, CustomUserAdmin)
admin.site.register(ConfirmEmail)

@ -9,13 +9,19 @@ from django.contrib.auth.models import BaseUserManager
class ConfirmEmailManager(models.Manager): class ConfirmEmailManager(models.Manager):
def confirm(self, user): def confirm(self, user):
"""Создает или обновляет запись, что email подтвержден.""" """
rec, created = self.get_or_create(user=user, defaults={'is_confirmed': True,}) Создает или обновляет запись, что email подтвержден.
"""
rec, created = self.get_or_create(user=user)
setattr(rec, 'is_confirmed', True)
rec.save()
return rec return rec
def unconfirm(self, user): def unconfirm(self, user):
"""Создает или обновляет запись, что нужно подтвердить email.""" """Создает или обновляет запись, что нужно подтвердить email."""
rec, created = self.get_or_create(user=user, defaults={'is_confirmed': False,}) rec, created = self.get_or_create(user=user)
setattr(rec, 'is_confirmed', False)
rec.save()
return rec return rec

Loading…
Cancel
Save