Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into mukhtar

archilance/settings/base.py

@@ -1,5 +1,7 @@
+from django.core.files.storage import FileSystemStorage
 import os
 
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 ROOT_DIR = os.path.dirname(BASE_DIR)
@@ -58,7 +60,26 @@ LOCAL_APPS = [
     'ratings',
 ]
 
-INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
+WAGTAIL = [
+    'wagtail.wagtailforms',
+    'wagtail.wagtailredirects',
+    'wagtail.wagtailembeds',
+    'wagtail.wagtailsites',
+    'wagtail.wagtailusers',
+    'wagtail.wagtailsnippets',
+    'wagtail.wagtaildocs',
+    'wagtail.wagtailimages',
+    'wagtail.wagtailsearch',
+    'wagtail.wagtailadmin',
+    'wagtail.wagtailcore',
+
+    'modelcluster',
+    'taggit',
+
+    'cms_pages',
+]
+
+INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS + WAGTAIL
 
 MIDDLEWARE_CLASSES = [
     'django.middleware.security.SecurityMiddleware',
@@ -70,6 +91,9 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'common.middleware.SetLastVisitMiddleware',
+
+    'wagtail.wagtailcore.middleware.SiteMiddleware',
+    'wagtail.wagtailredirects.middleware.RedirectMiddleware',
 ]
 
 ROOT_URLCONF = 'archilance.urls'
@@ -286,3 +310,17 @@ else:
         'shop_id': 0,
         'scid': 0,
     })
+
+WAGTAIL_SITE_NAME = 'PROEKTON'
+
+
+# class ASCIIFileSystemStorage(FileSystemStorage):
+#     def get_valid_name(self, name):
+#         symbols = (u"абвгдеёжзийклмнопрстуфхцчшщъыьэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ",
+#            u"abvgdeejzijklmnoprstufhzcss_y_euaABVGDEEJZIJKLMNOPRSTUFHZCSS_Y_EUA")
+#         
+#         tr = {ord(a):ord(b) for a, b in zip(*symbols)}
+#         name = name.translate(tr)
+#         return super().get_valid_name(name)
+# 
+# DEFAULT_FILE_STORAGE = ASCIIFileSystemStorage

archilance/urls.py

@@ -8,6 +8,9 @@ from django.views.generic import TemplateView
 from .views import HomeTemplateView, TestChatTemplateView
 from wallets.views import TmpCheckOrderView, TmpPaymentAvisoView
 
+from wagtail.wagtailadmin import urls as wagtailadmin_urls
+from wagtail.wagtailcore import urls as wagtail_urls
+
 
 urlpatterns = [
     url(r'^$', HomeTemplateView.as_view()),
@@ -26,8 +29,9 @@ urlpatterns = [
     url(r'^users/', include('registration.backends.default.urls')),
     url(r'^admin/', admin.site.urls),
     url(r'^api/', include('api.urls')),
-    
-    
+    url(r'^cms/', include(wagtailadmin_urls)),
+    url(r'^pages/', include(wagtail_urls)),
+
     # TODO: Move URLs into the "wallets" app (Yandex Money settings modification needed):
     
     url(r'^yandex/check$', TmpCheckOrderView.as_view(), name='tmp-check-order'),

cms_pages/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

cms_pages/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CmsPagesConfig(AppConfig):
+    name = 'cms_pages'

cms_pages/migrations/0001_initial.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-26 12:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+import wagtail.wagtailimages.blocks
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('wagtailcore', '0029_unicode_slugfield_dj19'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CmsPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+                ('body', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))),
+                ('date', models.DateField(verbose_name='Дата размещения')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+    ]

cms_pages/models.py

@@ -0,0 +1,26 @@
+from django.db import models
+from wagtail.wagtailadmin.edit_handlers import StreamFieldPanel, FieldPanel
+from wagtail.wagtailcore import blocks
+from wagtail.wagtailcore.fields import StreamField
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailimages.blocks import ImageChooserBlock
+
+__author__ = 'PekopT'
+
+
+class CmsPage(Page):
+    body = StreamField([
+        ('heading', blocks.CharBlock(classname="full title")),
+        ('paragraph', blocks.RichTextBlock()),
+        ('image', ImageChooserBlock()),
+    ])
+    date = models.DateField("Дата размещения")
+
+    content_panels = Page.content_panels + [
+        FieldPanel('date'),
+        StreamFieldPanel('body'),
+    ]
+
+    # promote_panels = [
+    #     MultiFieldPanel(Page.promote_panels, "Common page configuration"),
+    # ]

cms_pages/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

cms_pages/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

projects/models.py

@@ -287,6 +287,7 @@ class Portfolio(models.Model):
     budget = models.DecimalField(max_digits=10, decimal_places=0, default=0, null=True, blank=True)
     building_classification = models.ForeignKey(BuildingClassfication, related_name='portfolios', null=True, blank=True)
     construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=True)
+    created = models.DateTimeField(default=timezone.now)
     currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True)
     description = models.TextField()
     location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True)
@@ -296,7 +297,6 @@ class Portfolio(models.Model):
     term_type = models.CharField(max_length=20, choices=TERMS, default='hour', null=True, blank=True)
     user = models.ForeignKey(User, related_name='portfolios', null=True, blank=True)
     worksell = models.BooleanField(default=False)
-    created = models.DateTimeField(default=timezone.now)
     
     def __str__(self):
         return self.name
@@ -320,8 +320,7 @@ class Portfolio(models.Model):
 
     def get_cover(self):
         photo = self.photos.first()
-        return photo and photo.img
-
+        return photo and photo.img # WTF? We could at leat return a URL, not an object
 
 
 class PortfolioPhoto(models.Model):

projects/templates/project_filter.html

@@ -180,11 +180,13 @@
                                 <a href="{% url 'projects:detail' pk=project.pk %}">{{ project.name }}</a>
                             </p>
                             
-                            <ul class="desPro">
-                                <li>
-                                    Объект "{{ project.realty.name }}"
-                                </li>
-                            </ul>
+                            {% if project.realty %}
+                                <ul class="desPro">
+                                    <li>
+                                        Объект "{{ project.realty.name }}"
+                                    </li>
+                                </ul>
+                            {% endif %}
                             
                             <p class="textPro">{{ project.text|linebreaksbr|truncatechars:300 }}</p>
                             

ratings/models.py

@@ -22,7 +22,7 @@ class HistoryRating(models.Model):
 class SpecializationRating(models.Model):
     user = models.ForeignKey(User, related_name='specialization_rating', null=True, blank=True)
     team = models.ForeignKey(Team, related_name='specialization_rating', null=True, blank=True)
-    specialization = models.ForeignKey(Specialization, related_name='specialization_rating')
+    specialization = models.ForeignKey(Specialization, related_name='specialization_rating') # TODO: Pluralize related name
     position = models.PositiveIntegerField(default=0)
 
     def __str__(self):
@@ -31,5 +31,3 @@ class SpecializationRating(models.Model):
     class Meta:
         verbose_name = 'Рейтинг специализаций'
         verbose_name_plural = 'Рейтинги специализаций'
-
-

requirements/base.txt

@@ -42,3 +42,4 @@ gunicorn==19.6.0
 rest-framework-generic-relations
 django-hitcount
 django-activeurl==0.1.9
+wagtail==1.6

templates/cms_pages/cms_page.html

@@ -0,0 +1,22 @@
+{% extends 'partials/base.html' %}
+
+{% block content %}
+  <section class="mainContainer">
+    {% include 'partials/header.html' %}
+    <div class="container-fluid">
+      <div class="row">
+        <h1>{{ page.title }}</h1>
+      </div>
+    </div>
+  </section>
+
+  {% for block in page.body %}
+    {% if block.block_type == 'heading' %}
+      <h2>{{ block.value }}</h2>
+    {% else %}
+      <section class="block-{{ block.block_type }}">
+        {{ block }}
+      </section>
+    {% endif %}
+  {% endfor %}
+{% endblock %}

templates/partials/header.html

@@ -111,9 +111,9 @@
                                     <a href="{% url 'users:user-profile-edit' pk=request.user.pk %}">Настройки<span></span></a>
                                 </li>
 
-{#                                <li class="icon_mm6">#}
-{#                                    <a href="#">FAQ<span></span></a>#}
-{#                                </li>#}
+                                <li class="icon_mm6">
+                                    <a href="/pages/faq">FAQ<span></span></a>
+                                </li>
 
                                 <li class="icon_mm6">
                                     <a href="{% url 'auth_logout' %}">Выйти<span></span></a>

users/models.py

@@ -195,6 +195,10 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     def is_owner_team(self):
         return Team.objects.filter(owner=self.pk).exists()
+    
+    def get_popular_specialization(self):
+        from ratings.models import SpecializationRating
+        return SpecializationRating.objects.filter(user=self).order_by('position').first().specialization.name
 
 
 class Team(models.Model):

users/templates/contractor_filter.html

@@ -196,7 +196,9 @@
                                         </a>
                                     </li>
                                     <li>
-                                        <a href="javascript:void(0)">
+{#                                        TODO #}
+{#                                        <a href="{% url 'chat:chat-user' %}?user_id={{ team..owner.pk }}">#}
+                                        <a href="#">
                                             написать сообщение
                                         </a>
                                     </li>

users/templates/contractor_office.html

@@ -16,57 +16,61 @@
             {% include 'partials/contractor_profile_tabs.html' %}
             
             <div class="buttonGP disTab">
-                <div class="btn-group valProject2 val-pro3" role="group" aria-label="...">
+                <div class="btn-group valProject2 val-pro3" role="group">
                     <button type="button" class="btn btn-default">
-                        Группа 1
-                        <span><mark>7</mark></span>
+                        {{ contractor.team.name }}
+                        <span><mark>0</mark></span>
                     </button>
 
                     {% if not contractor.is_owner_team %}
-                        <button type="button" class="btn btn-default add-group" data-toggle="modal"
-                                data-target="#myModal">
+                        <button type="button" class="btn btn-default add-group" data-toggle="modal" data-target="#myModal">
                             + Добавить группу
                         </button>
                     {% endif %}
                 </div>
-
-                <!-- Modal -->
+                
                 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
                     <div class="modal-dialog" role="document">
                         <div class="modal-content">
                             <div class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                                        aria-hidden="true">&times;</span></button>
+                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                                
                                 <h4 class="modal-title" id="myModalLabel">Добавление новой группы</h4>
                             </div>
-                            <div class="modal-body">
-                                <form method="post" action="{% url 'users:team-create' %}">{% csrf_token %}
+                            
+                            <form method="post" action="{% url 'users:team-create' %}">{% csrf_token %}
+                                <div class="modal-body">
                                     <div class="textAreaBlock2 text-nn box-sizing disTab">
                                         <p>Название <span style="color: red">{{ form_team.name.errors.as_text }}</span></p>
                                         <input type="text" class="box-sizing" name="{{ form_team.name.html_name }}">
                                     </div>
-
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть</button>
-                                <button type="submit" class="btn btn-primary">Сохранить</button>
-
-                            </div>
+                                </div>
+                                
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть</button>
+                                    <button type="submit" class="btn btn-primary">Сохранить</button>
+                                </div>
                             </form>
                         </div>
                     </div>
                 </div>
             </div>
             
-            {% if  contractor.is_owner_team %}
+            {% if contractor.is_owner_team %}
                 <div class="projectsBlock disTab">
                     <div class="col-lg-12">
                         <div class="col-lg-3 divCol3">
                             <div class="avatar">
                                 <div class="avatarInset">
-                                    {% thumbnail contractor.avatar "265x264" crop="center" as im %}
-                                        <img src="{{ im.url }}" alt="profile-image">
-                                    {% endthumbnail %}
+                                    {% if contractor.avatar %}
+                                        {% thumbnail contractor.avatar "265x264" crop="center" as im %}
+                                            <img src="{{ im.url }}" alt="profile-image">
+                                        {% endthumbnail %}
+                                    {% else %}
+                                        <img src="{% static 'img/profile.jpg' %}" alt="profile-image">
+                                    {% endif %}
                                 </div>
                             </div>
     
@@ -79,23 +83,25 @@
                                     <p>Состав группы</p>
     
                                     {% for p in participants %}
-    
                                         <div class="message-new">
-    
                                             <div class="imgMess">
-                                                {% thumbnail p.avatar "60x60" crop="center" as im %}
-                                                    <img src="{{ im.url }}" alt="mess-image">
-                                                {% endthumbnail %}
+                                                {% if p.avatar %}
+                                                    {% thumbnail p.avatar "60x60" crop="center" as im %}
+                                                        <img src="{{ im.url }}" alt="mess-image">
+                                                    {% endthumbnail %}
+                                                {% else %}
+                                                    <img src="{% static 'img/profile.jpg' %}" alt="mess-image">
+                                                {% endif %}
                                             </div>
     
-                                            <p class="nameMess">
+                                            <p class="nameMess" style="float: none">
                                                 <a href="{% url 'users:contractor-profile' p.pk %}">{{ p.get_full_name }}</a>
                                             </p>
     
-                                            <span>Программист</span>
+                                            <p><span>{{ p.get_popular_specialization }}</span></p>
                                         </div>
                                     {% empty %}
-                                      В группе пока нет участников
+                                        В группе пока нет участников
                                     {% endfor %}
                                 </div>
                             </div>
@@ -103,18 +109,18 @@
     
                         <div class="col-lg-9 divCol9">
                             <div class="col-lg-4">
-                                <p class="nameUser">
-                                    {{ contractor.team }}
-                                </p>
+                                <p class="nameUser">{{ contractor.team.name }}</p>
                                 <p class="cityUser">Россия, Москва</p>
-                                {#                          <p class="navv">На сайте 8 лет и 3 месяца</p>#}
                                 <p class="navv">На сайте {{ contractor.team.created }}</p>
+                                
                                 <p class="navv">
                                     Кол-во человек: <span>{{ participants_count }}</span>
                                 </p>
+                                
                                 <p class="navv">
                                     Выполненных проектов: <span>0</span>
                                 </p>
+                                
                                 <div class="statusUser st-new">Свободен</div>
                                 <a href="javascript:void(0)" class="new-prop new-prop2 new-prop3">написать сообщение</a>
                             </div>
@@ -124,20 +130,17 @@
                             </div>
     
                             <div class="col-lg-4">
-                                {% if contractor.team %}
-                                    {% ratings_team_widget contractor.team.pk %}
-                                {% endif %}
+                                {% ratings_team_widget contractor.team.pk %}
     
                                 {% if contractor.cro %}
-                                <div class="sroUser">
-                                    <div class="iconSRO"></div>
-                                    <p>Есть допуск СРО</p>
-                                </div>
+                                    <div class="sroUser">
+                                        <div class="iconSRO"></div>
+                                        <p>Есть допуск СРО</p>
+                                    </div>
                                 {% endif %}
                             </div>
                         </div>
     
-    
                         <div class="col-lg-9">
                             <div class="profileTabs2">
                                 <ul class="nav nav-tabs nav-justified">
@@ -156,55 +159,41 @@
     
                         <div class="tab-content">
                             <div id="tab11" class="tab-pane fade in active">
-    
                                 <div class="galleryWork2 disTab col-lg-9">
                                     {% for p in portfolios %}
                                         <div class="col-lg-4">
                                             <div class="insetCol box-sizing disTab">
-                                                <div class="imgGal"
-                                                     style="background:rgba(0, 0, 0, 0) url('{{ p.get_cover }}') no-repeat scroll center center / cover ;">
+                                                <div class="imgGal" style="background:rgba(0, 0, 0, 0) url('{{ p.photos.first.img.url }}') no-repeat scroll center center / cover ;">
                                                     <div class="imgFigure"></div>
                                                 </div>
                                             </div>
-                                            <div class="insetCol2 box-sizing disTab">
-                                                <a href="{% url 'projects:contractor-portfolio-detail' p.pk %}">{{ p }}</a>
-                                                <div class="buttonsImg" disTab>
-                                                    <a href="{% url 'projects:contractor-portfolio-edit' p.pk %}">
-                                                        <div class="insetBI insetBI1">
-                                                            <i class="fa fa-pencil"></i>
-                                                        </div>
-                                                    </a>
-                                                    <div class="insetBI insetBI2">
-                                                        <i class="fa fa-times"></i>
-                                                    </div>
-                                                </div>
+                                            <div class="insetCol2 box-sizing disTab text-center">
+                                                <a href="{% url 'projects:contractor-portfolio-detail' p.pk %}">{{ p.name }}</a>
                                             </div>
                                         </div>
                                     {% empty %}
-                                      <div class="col-lg-12">
-                                        <p style="text-align: center;margin-top: 25px;">Работ в портфолио пока нет</p>
-                                      </div>
+                                        <div class="col-lg-12">
+                                            <p style="text-align: center;margin-top: 25px;">Работ в портфолио пока нет</p>
+                                        </div>
                                     {% endfor %}
-    
                                 </div>
-{#                                TODO:#}
-{#                                <div class="col-lg-9 col-lg-offset-3">#}
-{#                                    <div class="linkElse">#}
-{#                                        <a href="javascript:void(0)" class="showElse">показать еще</a>#}
-{#                                    </div>#}
-{#                                </div>#}
+                                
+                                <div class="col-lg-9 col-lg-offset-3">
+                                    <div class="linkElse">
+                                        <a href="javascript:void(0)" class="showElse">показать еще</a>
+                                    </div>
+                                </div>
                             </div>
     
                             <div id="tab12" class="tab-pane fade">
-    
                                 <div class="galleryWork2 disTab">
                                     {% for ws in work_sells %}
                                         <div class="col-lg-4">
                                             <div class="insetCol box-sizing disTab">
-                                                <div class="imgGal"
-                                                     style="background:rgba(0, 0, 0, 0) url('/media/{{ ws.img }}') no-repeat scroll center center / cover ;">
+                                                <div class="imgGal" style="background:rgba(0, 0, 0, 0) url('{{ ws.photos.first.img.url }}') no-repeat scroll center center / cover ;">
                                                     <div class="imgFigure"></div>
                                                 </div>
+                                                
                                                 <div class="cenaImg box-sizing">
                                                     <div class="cenaImgInset">
                                                         {{ ws.budget }} <i class="fa fa-rub"></i>
@@ -212,48 +201,49 @@
                                                 </div>
                                             </div>
                                             <div class="insetCol2 box-sizing disTab">
-                                                <a href="{% url 'work_sell:detail' ws.pk %}">{{ ws }}</a>
+                                                <a href="{% url 'work_sell:detail' ws.pk %}">{{ ws.name }}</a>
                                             </div>
                                         </div>
                                     {% empty %}
-                                      <div class="col-lg-12">
-                                        <p style="text-align: center;margin-top: 25px;">Готовых работ пока нет</p>
-                                      </div>
+                                        <div class="col-lg-12">
+                                            <p style="text-align: center;margin-top: 25px;">Готовых работ пока нет</p>
+                                        </div>
                                     {% endfor %}
                                 </div>
-{#                            TODO#}
-{#                                <div class="col-lg-9 col-lg-offset-3">#}
-{#                                    <div class="linkElse">#}
-{#                                        <a href="javascript:void(0)" class="showElse">показать еще</a>#}
-{#                                    </div>#}
-{#                                </div>#}
+                                
+                                <div class="col-lg-9 col-lg-offset-3">
+                                    <div class="linkElse">
+                                        <a href="javascript:void(0)" class="showElse">показать еще</a>
+                                    </div>
+                                </div>
                             </div>
-    
+                            
                             <div id="tab13" class="tab-pane fade">
-                              {% for review in reviews %}
-                                <div class="new-comm-44">
-                                    <div class="col-lg-12">
-                                        <p class="nameComm">
-                                            <a href="">{{ review.get_sender }}</a>
-                                        </p>
-                                        {% if review.project.deal_type == 'secure_deal' %}
-                                            <span class="dateComm44">
-                                                  Безопасная сделка
-                                            </span>
-                                        {% endif %}
-                                        <div class="stars box-sizing">
-                                            <a href="#">положительный отзыв</a>
+                                {% for review in reviews %}
+                                    <div class="new-comm-44">
+                                        <div class="col-lg-12">
+                                            <p class="nameComm">
+                                                <a href="#">{{ review.get_sender }}</a>
+                                            </p>
+                                            
+                                            {% if review.project.deal_type == 'secure_deal' %}
+                                                <span class="dateComm44">Безопасная сделка</span>
+                                            {% endif %}
+                                            
+                                            <div class="stars box-sizing">
+                                                <a href="#">положительный отзыв</a>
+                                            </div>
+                                            
+                                            <p class="textComm44">
+                                                {{ review.text|safe }}
+                                            </p>
                                         </div>
-                                        <p class="textComm44">
-                                            {{ review.text|safe }}
-                                        </p>
                                     </div>
-                                </div>
-                              {% empty %}
-                                <div class="new-comm-44">
-                                  <p style="text-align: center;">Отзывов пока нет</p>
-                                </div>
-                              {% endfor %}
+                                {% empty %}
+                                    <div class="new-comm-44">
+                                        <p style="text-align: center;">Отзывов пока нет</p>
+                                    </div>
+                                {% endfor %}
                             </div>
                         </div>
                     </div>

users/templates/contractor_office_open_projects.html

@@ -26,7 +26,7 @@
 				<div class="btn-group valProject2" role="group">
   					<a href="#" data-param-name="archived" data-default onclick="return false" class="btn btn-default -nav">
   						Открытые проекты
-						<span><mark>0</mark> / <span>{{ active_project_count }}</span></span>
+						<span><mark>0</mark> / <span>{{ open_project_count }}</span></span>
   					</a>
   					
   					<a href="#" data-param-name="archived" data-param-val="on" onclick="return false" class="btn btn-default -nav">
@@ -44,9 +44,11 @@
                                 <p class="titlePro">{{ project.name }}</p>
                             </a>
                             
-                            <ul class="desPro">
-                                <li>Объект "{{ project.realty.name }}"</li>
-                            </ul>
+                            {% if project.realty %}
+                                <ul class="desPro">
+                                    <li>Объект "{{ project.realty.name }}"</li>
+                                </ul>
+                            {% endif %}
                             
                             <p class="textPro">{{ project.text|linebreaksbr|truncatechars:300 }}</p>
                             

users/urls.py

@@ -5,8 +5,8 @@ from django.contrib.auth.views import login, logout
 from .views import (
     contractor_resumefile_create,
     ContractorFilterView,
-    ContractorOfficeDetailView,
     ContractorOfficeProjectsView,
+    ContractorOfficeView,
     ContractorProfileDetailView,
     ContractorResumeUpdateView,
     CustomerProfileCurrentProjectsView,
@@ -35,6 +35,6 @@ urlpatterns = [
     urls.url(r'^contractors/team/create/$', TeamCreateView.as_view(), name='team-create'),
     urls.url(r'^contractorsresumefiles/create/$', contractor_resumefile_create, name='contractor-resume-file-create'),
     urls.url(r'^contractors/(?P<pk>\d+)/$', ContractorProfileDetailView.as_view(), name='contractor-profile'),
-    urls.url(r'^contractor-office/(?P<pk>\d+)/$', ContractorOfficeDetailView.as_view(), name='contractor-office'),
+    urls.url(r'^contractor-office/(?P<pk>\d+)/$', ContractorOfficeView.as_view(), name='contractor-office'),
     urls.url(r'^contractor-office/(?P<pk>\d+)/open-projects/$', ContractorOfficeProjectsView.as_view(), name='contractor-office-open-projects'),
 ]

users/views.py

@@ -358,26 +358,31 @@ class ContractorProfileDetailView(DetailView):
         return context
 
 
-class ContractorOfficeDetailView(DetailView):
+class ContractorOfficeView(DetailView):
     model = User
     template_name = 'contractor_office.html'
     context_object_name = 'contractor'
-    form_team = TeamForm
+    form_class = TeamForm
     
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['form_team'] = TeamForm
-        participants = []
+        context['form_team'] = self.form_class
+        
         if self.object.is_owner_team():
             participants = self.object.team.contractors.all()
-            user_ids = [p.pk for p in participants]
             context['participants'] = participants
             context['participants_count'] = len(participants)
-            portfolios = Portfolio.objects.filter(user__in=user_ids)
-            work_sells = WorkSell.objects.filter(contractor__in=user_ids)
+            
+            contractors = tuple(itertools.chain(participants, (self.object,)))
+            
+            portfolios = Portfolio.objects.filter(user__in=contractors)
             context['portfolios'] = portfolios
+            
+            work_sells = WorkSell.objects.filter(contractor__in=contractors)
             context['work_sells'] = work_sells
-            context['reviews'] = Review.objects.filter(target_contractor__in=user_ids)
+            
+            context['reviews'] = Review.objects.filter(target_contractor__in=contractors)
+        
         return context
 
 
@@ -385,8 +390,7 @@ class ContractorOfficeProjectsView(BaseMixin, View):
     template_name = 'contractor_office_open_projects.html'
     
     def dispatch(self, request, *args, **kwargs):
-        # if request.user.is_authenticated() and request.user.is_contractor() and request.user.pk == int(kwargs.get('pk')):
-        if request.user.is_authenticated():
+        if request.user.is_authenticated() and request.user.is_contractor() and request.user.pk == int(kwargs.get('pk')):
             return super().dispatch(request, *args, **kwargs)
         else:
             raise PermissionDenied
@@ -397,8 +401,6 @@ class ContractorOfficeProjectsView(BaseMixin, View):
         contractor = get_object_or_404(User.contractor_objects, pk=kwargs.get('pk'))
         context['contractor'] = contractor
         
-        # TODO: Show projects only with "active" state
-        
         private_open_projects = tuple(a.project for a in contractor.contractor_answers.filter(project__state='active', rejected=False))
         private_archived_projects = tuple(a.project for a in contractor.contractor_answers.filter(project__state='active', rejected=True))
         

work_sell/migrations/0005_remove_worksell_img.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-26 12:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('work_sell', '0004_merge'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='worksell',
+            name='img',
+        ),
+    ]

work_sell/models.py

@@ -11,14 +11,15 @@ from specializations.models import Specialization
 
 
 class WorkSell(models.Model):
+    # TODO: Add consistency ("work_sell" vs "worksell"):
+    
     budget = models.DecimalField(max_digits=10, decimal_places=0, default=0, null=True, blank=True)
     building_classification = models.ForeignKey(BuildingClassfication, related_name='worksells', null=True, blank=True)
     construction_type = models.ForeignKey(ConstructionType, related_name='worksells', null=True, blank=True)
-    contractor = models.ForeignKey(User, related_name='work_sell', null=True, blank=True)
+    contractor = models.ForeignKey(User, related_name='work_sell', null=True, blank=True) # TODO: Pluralize related name
     created = models.DateTimeField(default=timezone.now)
     currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True)
     description = models.TextField(blank=True)
-    img = ImageField(upload_to='worksell/worksell', null=True, blank=True)
     location = TreeForeignKey('common.Location', related_name='worksells', null=True, blank=True)
     name = models.CharField(max_length=255)
     specialization = TreeForeignKey(Specialization, related_name='worksells', null=True, blank=True)