From 1f7cf0228f050374fca6f572b3ff43578dce2bee Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Thu, 19 May 2016 13:22:40 +0300 Subject: [PATCH] deleted ms --- projects/migrations/0001_initial.py | 52 ------------------- projects/migrations/0002_answer.py | 31 ----------- .../migrations/0003_auto_20160518_1132.py | 23 -------- projects/migrations/__init__.py | 0 specializations/migrations/0001_initial.py | 33 ------------ specializations/migrations/__init__.py | 0 users/migrations/0001_initial.py | 44 ---------------- users/migrations/0002_auto_20160519_0807.py | 27 ---------- users/migrations/__init__.py | 0 users/models.py | 5 -- 10 files changed, 215 deletions(-) delete mode 100644 projects/migrations/0001_initial.py delete mode 100644 projects/migrations/0002_answer.py delete mode 100644 projects/migrations/0003_auto_20160518_1132.py delete mode 100644 projects/migrations/__init__.py delete mode 100644 specializations/migrations/0001_initial.py delete mode 100644 specializations/migrations/__init__.py delete mode 100644 users/migrations/0001_initial.py delete mode 100644 users/migrations/0002_auto_20160519_0807.py delete mode 100644 users/migrations/__init__.py diff --git a/projects/migrations/0001_initial.py b/projects/migrations/0001_initial.py deleted file mode 100644 index 7191b94..0000000 --- a/projects/migrations/0001_initial.py +++ /dev/null @@ -1,52 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-05-18 16:08 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('specializations', '__first__'), - ] - - operations = [ - migrations.CreateModel( - name='Portfolio', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('description', models.TextField()), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='PortfolioPhoto', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('img', models.ImageField(upload_to='projects/portfolio')), - ('portfolio', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='projects.Portfolio')), - ], - ), - migrations.CreateModel( - name='Project', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('price', models.DecimalField(decimal_places=2, max_digits=10)), - ('text', models.TextField(blank=True)), - ('specialization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='projects', to='specializations.Specialization')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='projects', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'verbose_name_plural': 'Проекты', - 'verbose_name': 'Проект', - }, - ), - ] diff --git a/projects/migrations/0002_answer.py b/projects/migrations/0002_answer.py deleted file mode 100644 index 7315213..0000000 --- a/projects/migrations/0002_answer.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-05-19 08:44 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('projects', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Answer', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('cost', models.DecimalField(decimal_places=2, max_digits=10)), - ('cost_type', models.CharField(choices=[('RUR', 'rur'), ('USD', 'usd'), ('EUR', 'eur')], default='RUR', max_length=5)), - ('text', models.TextField()), - ('term', models.DecimalField(decimal_places=2, max_digits=10)), - ('term_type', models.CharField(choices=[('HOUR', 'hour'), ('DAY', 'day'), ('MONTH', 'month')], default='hour', max_length=10)), - ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='projects.Project')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/projects/migrations/0003_auto_20160518_1132.py b/projects/migrations/0003_auto_20160518_1132.py deleted file mode 100644 index b6371b3..0000000 --- a/projects/migrations/0003_auto_20160518_1132.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- 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', - ), - ] diff --git a/projects/migrations/__init__.py b/projects/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/specializations/migrations/0001_initial.py b/specializations/migrations/0001_initial.py deleted file mode 100644 index 3fd29b0..0000000 --- a/specializations/migrations/0001_initial.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-05-18 16:08 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import mptt.fields - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Specialization', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('lft', models.PositiveIntegerField(db_index=True, editable=False)), - ('rght', models.PositiveIntegerField(db_index=True, editable=False)), - ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), - ('level', models.PositiveIntegerField(db_index=True, editable=False)), - ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='specializations.Specialization')), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/specializations/migrations/__init__.py b/specializations/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py deleted file mode 100644 index 13202cd..0000000 --- a/users/migrations/0001_initial.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-05-18 16:08 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0007_alter_validators_add_error_messages'), - ] - - operations = [ - migrations.CreateModel( - name='User', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('first_name', models.CharField(blank=True, max_length=255)), - ('last_name', models.CharField(blank=True, max_length=255)), - ('email', models.EmailField(db_index=True, max_length=255, unique=True)), - ('is_active', models.BooleanField(default=True)), - ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), - ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), - ], - options={ - 'abstract': False, - }, - ), - migrations.CreateModel( - name='Team', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('users', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/users/migrations/0002_auto_20160519_0807.py b/users/migrations/0002_auto_20160519_0807.py deleted file mode 100644 index 1a60afb..0000000 --- a/users/migrations/0002_auto_20160519_0807.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-05-19 08:07 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='team', - name='owner', - field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='team', to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='team', - name='users', - field=models.ManyToManyField(blank=True, related_name='teams', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/users/models.py b/users/models.py index 5cd072e..a35336e 100644 --- a/users/models.py +++ b/users/models.py @@ -67,12 +67,7 @@ class Team(models.Model): def __str__(self): return self.name -<<<<<<< HEAD class Meta: verbose_name = 'Команда' verbose_name_plural = 'Команды' - - -======= ->>>>>>> f73c8cbb03160dbcba5094bb2be837d43d1e5f31