diff --git a/access/models.py b/access/models.py index 6b82ed8..aa7b96b 100755 --- a/access/models.py +++ b/access/models.py @@ -1,12 +1,13 @@ # encoding=utf-8 import random -import re +from django.conf import settings from django.db import models from django.contrib.auth.models import BaseUserManager, AbstractBaseUser import datetime from django.db.models import SET_NULL +from courses.models import Vertex from lms.regex import check_email from lms.settings import STATIC_ROOT, DOMAIN from lms.tools import random_string, random_int, out_date_format, get_client_ip @@ -625,32 +626,14 @@ class Questionnaire(models.Model): verbose_name_plural = u'Анкеты' -#class UserSync(models.Model): -# user = models.ForeignKey(User, verbose_name=u'Синхронизируемый') -# date = models.DateTimeField(verbose_name=u'Дата начала', default=datetime.datetime.now) -# data = models.TextField(verbose_name=u'Сырые данные', blank=True, default='') -# f_date = models.DateTimeField(verbose_name=u'Дата завершения процеса', blank=True, null=True) -# source = models.CharField(verbose_name=u'Источник синхронизации', max_length=255) -# dist = models.CharField(verbose_name=u'Получатель синхронизации', max_length=255) -# result = models.BooleanField(verbose_name=u'Результат синхронизации', default=False) +# Новое API -# def __str__(self): -# return '%s %s %s' % (self.user, self.f_date, self.result) - -# def __unicode__(self): -# return u'%s %s %s' % (self.user, self.f_date, self.result) - -# def good_sync(self): -# self.f_date = datetime.datetime.now() -# self.result = True -# self.save() -# self.user._set_synced() - -# def fail_sync(self): -# self.f_date = datetime.datetime.now() -# self.result = False -# self.save() - -# class Meta: -# verbose_name = u'Задача синхронизации' -# verbose_name_plural = u'Задачи синхронизации' +class Privilege(models.Model): + TYPES = ( + ('r', 'Отображение'), + ('u', 'Использование'), + ('w', 'Изменение'), + ) + user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name=u'Правообладатель') + value = models.CharField(verbose_name=u'Права', choices=TYPES, max_length=1, default='r') + subject = models.ForeignKey(to=Vertex, verbose_name=u'Объект')