remotes/origin/setup
ArturBaybulatov 10 years ago
parent 9dccdd1a73
commit d372753ffd
  1. 3
      .gitignore
  2. 16
      archilance/settings/base.py
  3. 7
      archilance/settings/dev.py
  4. 1
      specializations/models.py
  5. 5
      specializations/templates/specializations/specialization_list.html
  6. 5
      users/models.py

3
.gitignore vendored

@ -3,5 +3,4 @@
env/ env/
.ar/ .ar/
ar/ ar/
archilance/settings/local.py

@ -103,18 +103,10 @@ DATABASES = {
# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators # https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [ AUTH_PASSWORD_VALIDATORS = [
{ {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'},
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator'},
}, {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'},
{ {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
] ]
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (

@ -1,5 +1,8 @@
from .base import * from .base import *
INSTALLED_APPS += ['debug_toolbar']
AUTH_PASSWORD_VALIDATORS = [] AUTH_PASSWORD_VALIDATORS = []
try:
from .local import *
except ImportError:
pass

@ -2,6 +2,7 @@ from django.db import models
from mptt.models import MPTTModel, TreeForeignKey from mptt.models import MPTTModel, TreeForeignKey
from mptt.managers import TreeManager from mptt.managers import TreeManager
class Specialization(MPTTModel): class Specialization(MPTTModel):
name = models.CharField(max_length=100) name = models.CharField(max_length=100)
parent = TreeForeignKey('self', null=True, blank=True, related_name='children', db_index=True) parent = TreeForeignKey('self', null=True, blank=True, related_name='children', db_index=True)

@ -50,12 +50,11 @@
var csrftoken = getCookie('csrftoken'); var csrftoken = getCookie('csrftoken');
var spec_id = $(this).attr('data-id'); var spec_id = $(this).attr('data-id');
$.ajax({ $.ajax({
url:'/specializations/test/', url:'/api/specializations/',
type:'POST', type:'GET',
data:{csrfmiddlewaretoken : csrftoken, spec_id: spec_id}, data:{csrfmiddlewaretoken : csrftoken, spec_id: spec_id},
dataType:'json', dataType:'json',
success:function(json){ success:function(json){
alert(json.hello);
console.log(json); console.log(json);
} }
}); });

@ -3,6 +3,7 @@ from django.db import models
from django.utils import timezone from django.utils import timezone
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, AbstractUser, Group, PermissionsMixin from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, AbstractUser, Group, PermissionsMixin
class UserManager(BaseUserManager): class UserManager(BaseUserManager):
def create_user(self, email, password=None): def create_user(self, email, password=None):
if not email: if not email:
@ -54,7 +55,7 @@ class User(AbstractBaseUser, PermissionsMixin):
REQUIRED_FIELDS = [] REQUIRED_FIELDS = []
objects = UserManager() objects = UserManager()
contractor_objects = ContractorUserManager() contractor_objects = ContractorUserManager()
customers_objects = CustomerUserManager() customer_objects = CustomerUserManager()
class Meta: class Meta:
verbose_name = 'Пользователь' verbose_name = 'Пользователь'
@ -64,7 +65,7 @@ class User(AbstractBaseUser, PermissionsMixin):
class Team(models.Model): class Team(models.Model):
name = models.CharField(max_length=255) name = models.CharField(max_length=255)
users = models.ManyToManyField(User, related_name ='teams', blank=True) users = models.ManyToManyField(User, related_name ='teams', blank=True)
owner = models.OneToOneField(User, related_name='team', null=True) owner = models.OneToOneField(User, related_name='team', blank=True, null=True)
# groups = models.ManyToManyField(Group, related_name='teams', blank=True) # groups = models.ManyToManyField(Group, related_name='teams', blank=True)
def __str__(self): def __str__(self):

Loading…
Cancel
Save