merge

assets/index.js

@@ -29,7 +29,18 @@ app.run(['$rootScope', '$timeout', '$http',
 app.controller('TestCtrl', ['$scope', '$http', function TestCtrl($scope, $http) {
     var test = g.test = this
     
-    $http.get('/api/users/?is_admin=False').then(function(res) {
-        test.users = res.data.results
-    })
+    //$http.get('/api/users/?is_admin=False').then(function(res) {
+    //    test.users = res.data.results
+    //})
+    
+    test.x = null
+    
+    $scope.$watch(
+        function() {return test.x},
+        
+        function(newVal, oldVal) {
+            if (newVal !== oldVal)
+                console.log(test.x)
+        }
+    )
 }])

projects/filters.py

@@ -5,8 +5,8 @@ class ProjectFilterSet(FilterSet):
     name = AllLookupsFilter()
     price = AllLookupsFilter()
     text = AllLookupsFilter()
-    user = RelatedFilter('users.filters.UserFilterSet')
-    specialization = RelatedFilter('specializations.filters.SpecializationFilterSet')
+    # user = RelatedFilter('users.filters.UserFilterSet')
+    # specialization = RelatedFilter('specializations.filters.SpecializationFilterSet')
     
     class Meta:
         model = Project

projects/forms.py

@@ -4,7 +4,14 @@ from .models import Project, Portfolio
 class ProjectForm(ModelForm):
     class Meta:
         model = Project
-        fields = ['name', 'text', 'price', 'user','specialization']
+        
+        fields = (
+            'name',
+            'text',
+            'price',
+            # 'user',
+            # 'specialization',
+        )
 
 
 class PortfolioForm(ModelForm):

projects/migrations/0003_auto_20160518_1132.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-05-18 11:32
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0002_auto_20160517_0903'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='project',
+            name='specialization',
+        ),
+        migrations.RemoveField(
+            model_name='project',
+            name='user',
+        ),
+    ]

projects/models.py

@@ -8,11 +8,12 @@ class Project(models.Model):
     name = models.CharField(max_length=255)
     price = models.DecimalField(max_digits=10, decimal_places=2)
     text = models.TextField(blank=True)
+    # user = models.ForeignKey(User, related_name='projects')
+    # specialization = models.ForeignKey(Specialization, related_name='projects', blank=True, null=True) # TODO: Make required
+    
     # type_work = models.CharField()
     # budget = models.CharField()
     # cro = models.BooleanField(default=False)
-    user = models.ForeignKey(User, related_name='projects')
-    specialization = models.ForeignKey(Specialization, related_name='projects', blank=True, null=True) # TODO: Make required
     
     def __str__(self):
         return self.name

projects/serializers.py

@@ -5,20 +5,17 @@ from specializations.serializers import SpecializationSerializer
 from users.serializers import UserSerializer
 
 class ProjectSerializer(ModelSerializer):
-    user = UserSerializer()
-    specialization = SpecializationSerializer()
+    # specialization = SpecializationSerializer()
+    # user = UserSerializer()
     
     class Meta:
         model = Project
         
         fields = (
             'id',
+            # 'specialization',
+            # 'user',
             'name',
             'price',
-            'specialization',
             'text',
-            'user',
         )
-    
-    def create(self, validated_data):
-        return Project.objects.create(**validated_data)

users/models.py

@@ -7,12 +7,12 @@ class UserManager(BaseUserManager):
     def create_user(self, email, password=None):
         if not email:
             raise ValueError('Users must have an email address')
-
+        
         user = self.model(email=UserManager.normalize_email(email),)
         user.set_password(password)
         user.save(using=self._db)
         return user
-
+    
     def create_superuser(self, email, password):
         user = self.create_user(email, password)
         user.is_superuser = True
@@ -42,10 +42,10 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     def __str__(self):
         return self.email
-
+    
     def get_short_name(self):
         return self.email
-
+    
     def get_full_name(self):
         return self.first_name + ' ' + self.last_name
     
@@ -67,9 +67,12 @@ class Team(models.Model):
 
     def __str__(self):
         return self.name
+<<<<<<< HEAD
 
     class Meta:
         verbose_name = 'Команда'
         verbose_name_plural = 'Команды'
 
 
+=======
+>>>>>>> f73c8cbb03160dbcba5094bb2be837d43d1e5f31

users/serializers.py

@@ -21,11 +21,10 @@ class UserSerializer(ModelSerializer):
         read_only_fields = (
             'is_active',
             'is_admin',
-            'projects',
         )
     
-    def create(self, validated_data):
-        return User.objects.create(**validated_data)
+    # def create(self, validated_data):
+    #     return User.objects.create(**validated_data)
     
     # def update(self, inst, validated_data):
     #     inst.email = validated_data.get('email', inst.email)