diff --git a/archilance/management/commands/generate_teams.py b/archilance/management/commands/generate_teams.py index f5d0317..edee3ef 100644 --- a/archilance/management/commands/generate_teams.py +++ b/archilance/management/commands/generate_teams.py @@ -37,7 +37,7 @@ class Command(BaseCommand): team.save() team.owner = owner - team.users = _.sample(members, _.random(1, 5)) + team.contractors = _.sample(members, _.random(1, 5)) team.specializations = Specialization.objects.root_nodes()[0].get_descendants().order_by('?')[:_.random(1, 5)] team.portfolios = Portfolio.objects.order_by('?')[:_.random(1, 10)] diff --git a/projects/migrations/0015_merge.py b/projects/migrations/0015_merge.py new file mode 100644 index 0000000..5374b20 --- /dev/null +++ b/projects/migrations/0015_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-05 07:09 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0013_auto_20160803_2003'), + ('projects', '0014_auto_20160804_1754'), + ] + + operations = [ + ] diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html index 7b251ea..99cce29 100644 --- a/projects/templates/project_detail.html +++ b/projects/templates/project_detail.html @@ -100,24 +100,23 @@
-
- -
+ + {% if project.realty %} +
+ +
+ {% endif %} +

{{ project.text }}

+
{% if request.user.is_contractor %} @@ -171,7 +170,7 @@ {% with answer=request.user.contractor_answers.first %} -
+
@@ -186,8 +185,13 @@

{{ answer.author.get_full_name }} [{{ answer.author.username }}]

-

На сайте {{ answer.contractor.created }}

-
Свободен
+

На сайте {{ answer.author.created }}

+ + {% if answer.author|class_name == 'User' %} + {% if answer.author.contractor_status == 'free' %} +
Свободен
+ {% endif %} + {% endif %}
    @@ -201,6 +205,7 @@
+

Есть допуск СРО

diff --git a/users/migrations/0005_merge.py b/users/migrations/0005_merge.py new file mode 100644 index 0000000..fb87fde --- /dev/null +++ b/users/migrations/0005_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-05 07:09 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0004_user_contractor_rating'), + ('users', '0004_team_avatar'), + ] + + operations = [ + ] diff --git a/users/migrations/0006_auto_20160805_1442.py b/users/migrations/0006_auto_20160805_1442.py new file mode 100644 index 0000000..7dbba8b --- /dev/null +++ b/users/migrations/0006_auto_20160805_1442.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-05 11:42 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0005_merge'), + ] + + operations = [ + migrations.RemoveField( + model_name='team', + name='users', + ), + migrations.AddField( + model_name='team', + name='contractors', + field=models.ManyToManyField(blank=True, related_name='teams', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/users/models.py b/users/models.py index b0e367a..9dd7cd0 100644 --- a/users/models.py +++ b/users/models.py @@ -146,10 +146,6 @@ class User(AbstractBaseUser, PermissionsMixin): def is_staff(self): return self.is_superuser - @property - def is_free(self): - return self.contractor_status == 'free' - def __str__(self): return self.email @@ -192,7 +188,7 @@ class Team(models.Model): name = models.CharField(max_length=255) owner = models.OneToOneField(User, related_name='team', blank=True, null=True) specializations = TreeManyToManyField(Specialization, related_name='teams', blank=True) - users = models.ManyToManyField(User, related_name ='teams', blank=True) + contractors = models.ManyToManyField(User, limit_choices_to={'groups__name': 'Исполнители'}, related_name ='teams', blank=True) def __str__(self): return self.name diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index 3788420..3c0f013 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -75,9 +75,11 @@

Россия, Москва

На сайте 8 лет и 3 месяца

- {% if contractor.is_free %} + + {% if contractor.contractor_status == 'free' %}
Свободен
{% endif %} + показать контакты
diff --git a/users/views.py b/users/views.py index e117dcb..000cf7b 100644 --- a/users/views.py +++ b/users/views.py @@ -339,7 +339,8 @@ class ContractorProfileDetailView(DetailView): portfolio_form_class = PortfolioForm template_name = 'contractor_profile.html' context_object_name = 'contractor' - + queryset = User.contractor_objects + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs)