Update

.gitignore

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

archilance/settings/base.py

@@ -103,18 +103,10 @@ DATABASES = {
 # https://docs.djangoproject.com/en/1.9/ref/settings/#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 = (

archilance/settings/dev.py

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

archilance/settings/prod.py

@@ -1,3 +1,3 @@
 from .base import *
 
-DEBUG=False
+DEBUG = False

specializations/models.py

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

specializations/templates/specializations/specialization_list.html

@@ -7,18 +7,18 @@
     {#    {% endfor %}#}
     {##}
     {% load mptt_tags %}
-    {#<ul>#}
+{#    <ul>#}
-    {#    {% recursetree object_list %}#}
+{#        {% recursetree object_list %}#}
-    {#        <li>#}
+{#            <li>#}
-    {#            {{ node.name }}#}
+{#                {{ node.name }}#}
-    {#            {% if not node.is_leaf_node %}#}
+{#                {% if not node.is_leaf_node %}#}
-    {#                <ul class="children">#}
+{#                    <ul class="children">#}
-    {#                    {{ children }}#}
+{#                        {{ children }}#}
-    {#                </ul>#}
+{#                    </ul>#}
-    {#            {% endif %}#}
+{#                {% endif %}#}
-    {#        </li>#}
+{#            </li>#}
-    {#    {% endrecursetree %}#}
+{#        {% endrecursetree %}#}
-    {#</ul>#}
+{#    </ul>#}
     {% for ch in children %}
         <p class="spec_list" data-id="{{ ch.id }}"> {{ ch }} </p>
         {% for ch1 in ch.get_children %}
@@ -50,12 +50,11 @@
                     var csrftoken = getCookie('csrftoken');
                     var spec_id = $(this).attr('data-id');
                     $.ajax({
-                        url:'/specializations/test/',
+                        url:'/api/specializations/',
-                        type:'POST',
+                        type:'GET',
                         data:{csrfmiddlewaretoken : csrftoken, spec_id: spec_id},
                         dataType:'json',
                         success:function(json){
-                            alert(json.hello);
                             console.log(json);
                         }
                     });

users/models.py

@@ -3,6 +3,7 @@ from django.db import models
 from django.utils import timezone
 from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, AbstractUser, Group, PermissionsMixin
 
+
 class UserManager(BaseUserManager):
     def create_user(self, email, password=None):
         if not email:
@@ -54,7 +55,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     REQUIRED_FIELDS = []
     objects = UserManager()
     contractor_objects = ContractorUserManager()
-    customers_objects = CustomerUserManager()
+    customer_objects = CustomerUserManager()
     
     class Meta:
         verbose_name = 'Пользователь'
@@ -64,7 +65,7 @@ class User(AbstractBaseUser, PermissionsMixin):
 class Team(models.Model):
     name = models.CharField(max_length=255)
     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)
     
     def __str__(self):