From 62bc480d1909fbb1be0bda472c80bf681beaca07 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Fri, 23 Sep 2016 18:39:29 +0300
Subject: [PATCH] Fixes

---
 assets/css/main.css                           |  1 +
 assets/index.js                               |  6 +++---
 projects/forms.py                             |  5 ++++-
 projects/templates/comparison.html            |  2 +-
 projects/templates/project_detail.html        | 10 +++++-----
 users/admin.py                                |  4 ++--
 users/forms.py                                |  1 +
 users/models.py                               |  3 ++-
 .../partials/contractor_profile_tabs.html     |  2 --
 users/templatetags/user_tags.py               | 19 ++++++++++++-------
 work_sell/forms.py                            |  1 +
 work_sell/templates/worksell_detail.html      |  2 +-
 12 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/assets/css/main.css b/assets/css/main.css
index 6a00ed6..88fd7fb 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -3719,6 +3719,7 @@ input[type="checkbox"]:checked + span {
 .documentsChat ul {
     float: left;
     margin: 4px 0 0 32px;
+    max-width: 210px;
 }
 
 .documentsChat ul li {
diff --git a/assets/index.js b/assets/index.js
index 33f2417..5f1fea7 100644
--- a/assets/index.js
+++ b/assets/index.js
@@ -57,7 +57,7 @@ $('[data-tooltip]').tooltip({
                     results: _.map(function(item) {
                         return {
                             id: item.id,
-                            text: _.repeat(item.level-1, '---') + item.name,
+                            text: _.repeat(item.level-1, '  ') + item.name,
                             origItem: item,
                         }
                     }, data.results),
@@ -244,7 +244,7 @@ $('[data-tooltip]').tooltip({
                     results: _.map(function(item) {
                         return {
                             id: item.id,
-                            text: _.repeat(item.level-1, '---') + item.name,
+                            text: _.repeat(item.level-1, '  ') + item.name,
                             origItem: item,
                         }
                     }, data.results),
@@ -300,7 +300,7 @@ $('[data-tooltip]').tooltip({
                 .then(function(spec) {
                     $select.select2('data', {
                         id: spec.id,
-                        text: _.repeat(spec.level-1, '---') + spec.name,
+                        text: _.repeat(spec.level-1, '  ') + spec.name,
                         origItem: spec,
                     })
                 })
diff --git a/projects/forms.py b/projects/forms.py
index 74bca1e..23364fc 100644
--- a/projects/forms.py
+++ b/projects/forms.py
@@ -158,7 +158,8 @@ class RealtyForm(forms.ModelForm):
         widget=forms.Select(attrs={
             'class': 'selectpicker',
             'id': 'realtyBuildingClassificationId'
-        })
+        }),
+        level_indicator='  ',
     )
 
     class Meta:
@@ -191,6 +192,7 @@ class PortfolioForm(forms.ModelForm):
     building_classification = TreeNodeChoiceField(
         BuildingClassfication.objects.exclude(name='_root'),
         widget=forms.Select(attrs={'class': 'selectpicker'}),
+        level_indicator='  ',
     )
     duplicate = forms.BooleanField(required=False, label='Some label here')
     images_ids = forms.CharField(required=True)
@@ -225,6 +227,7 @@ class PortfolioEditForm(forms.ModelForm):
     building_classification = TreeNodeChoiceField(
         BuildingClassfication.objects.exclude(name='_root'),
         widget=forms.Select(attrs={'class': 'selectpicker'}),
+        level_indicator='  ',
     )
     
     class Meta:
diff --git a/projects/templates/comparison.html b/projects/templates/comparison.html
index 73a7e82..6a0b4ce 100644
--- a/projects/templates/comparison.html
+++ b/projects/templates/comparison.html
@@ -47,7 +47,7 @@
                                 <td>
                                     {% if cand.answer.term_type == 'project' %}
                                         За проект
-                                    {% else %}
+                                    {% elif cand.answer.term and cand.answer.term_type %}
                                         {% morph cand.answer.term TERM_TYPE_MORPHS|get:cand.answer.term_type %}
                                     {% endif %}
                                 </td>
diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html
index 876ad00..434bc3c 100644
--- a/projects/templates/project_detail.html
+++ b/projects/templates/project_detail.html
@@ -1051,11 +1051,11 @@
                                                 <a href="#" onclick="$(this).closest('form').submit(); return false" class="candLink candLink1" title="{{ answer.pk }}">Восстановить</a>
                                             </form>
                                             
-                                            {% if answer.author|class_name == 'User' %}
-                                                <a href="{% url 'chat:chat-user' %}?user_id={{ answer.author.pk }}" class="candLink candLink2">Перейти к обсуждению</a>
-                                            {% elif answer.author|class_name == 'Team'%}
-                                                <a href="{% url 'chat:chat-user' %}?user_id={{ answer.author.owner.pk }}" class="candLink candLink2">Перейти к обсуждению</a>
-                                            {% endif %}
+{#                                            {% if answer.author|class_name == 'User' %}#}
+{#                                                <a href="{% url 'chat:chat-user' %}?user_id={{ answer.author.pk }}" class="candLink candLink2">Перейти к обсуждению</a>#}
+{#                                            {% elif answer.author|class_name == 'Team'%}#}
+{#                                                <a href="{% url 'chat:chat-user' %}?user_id={{ answer.author.owner.pk }}" class="candLink candLink2">Перейти к обсуждению</a>#}
+{#                                            {% endif %}#}
                                         </div>
                                         
                                         <div class="col-xs-12">
diff --git a/users/admin.py b/users/admin.py
index f74d89f..6f644cd 100644
--- a/users/admin.py
+++ b/users/admin.py
@@ -11,8 +11,8 @@ from .models import (
 
 
 class UserAdmin(admin.ModelAdmin):
-    readonly_fields = ('pk',)
-    list_display = ('username', 'email', 'get_groups', 'cro', 'is_active', 'rating','last_time_visit',)
+    readonly_fields = ('pk','is_staff')
+    list_display = ('username', 'email', 'get_groups', 'cro', 'is_active', 'rating','last_time_visit')
     ordering = ('-rating',)
     
     def get_groups(self, obj):
diff --git a/users/forms.py b/users/forms.py
index e2f1acd..ade4f21 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -199,6 +199,7 @@ class ContractorFilterForm(forms.Form):
             'class': 'selectpicker',
         }),
         required=False,
+        level_indicator='  ',
     )
     
     work_type = forms.ChoiceField(
diff --git a/users/models.py b/users/models.py
index 3a31d36..ab3263b 100644
--- a/users/models.py
+++ b/users/models.py
@@ -160,7 +160,8 @@ class User(AbstractBaseUser, PermissionsMixin):
     
     @property
     def is_staff(self):
-        return self.is_superuser
+        # return self.is_superuser
+        return True
 
     def __str__(self):
         return self.email
diff --git a/users/templates/partials/contractor_profile_tabs.html b/users/templates/partials/contractor_profile_tabs.html
index b4f0ed4..e2a294d 100644
--- a/users/templates/partials/contractor_profile_tabs.html
+++ b/users/templates/partials/contractor_profile_tabs.html
@@ -5,8 +5,6 @@
 {% url 'users:contractor-office-open-projects' as contractor_office_open_projects_url %}
 {% url 'users:contractor-office-chat-projects' as contractor_office_chat_projects_url %}
 
-{% load user_tags %}
-
 <div class="profileTabs">
     <ul class="nav nav-tabs nav-justified">
         <li role="presentation">
diff --git a/users/templatetags/user_tags.py b/users/templatetags/user_tags.py
index 8381cc1..3a843a1 100644
--- a/users/templatetags/user_tags.py
+++ b/users/templatetags/user_tags.py
@@ -2,10 +2,13 @@ from chat.models import NewMessage
 from django import template
 from django.core.paginator import Page
 from django.db.models import Q, Count
+import itertools
 import math
 
-from reviews.models import Review
+from archilance import util
 from projects.models import Order
+from reviews.models import Review
+from users.helpers import get_projects_grouped
 
 
 register = template.Library()
@@ -112,9 +115,11 @@ def get_customer_chat_open_projects(user):
 def get_project_message_count(user):
     if user.is_customer():
         projects = user.customer_projects.filter(state='active').exclude(order__contractor__isnull=True, order__team__isnull=True)
-    # elif user.is_contractor():
-    #     # projects = user.customer_projects.filter(state='active').exclude(order__contractor__isnull=True, order__team__isnull=True)
-    
-        return projects.aggregate(message_count=Count('answers__messages'))['message_count']
-    else:
-        return '' # TODO
+        return projects.aggregate(c=Count('answers__messages'))['c']
+    elif user.is_contractor():
+        message_count = user.contractor_answers.filter(project__state='active', rejected=False).aggregate(c=Count('messages'))['c']
+        
+        if util.has_related(user, 'team'):
+            message_count += user.team.answers.filter(project__state='active', rejected=False).aggregate(c=Count('messages'))['c']
+        
+        return message_count
diff --git a/work_sell/forms.py b/work_sell/forms.py
index 947baed..84fc45a 100644
--- a/work_sell/forms.py
+++ b/work_sell/forms.py
@@ -39,6 +39,7 @@ class WorkSellForm(forms.ModelForm):
             'class': 'selectpicker'
         }),
         required=False,
+        level_indicator='  ',
     )
     
     class Meta:
diff --git a/work_sell/templates/worksell_detail.html b/work_sell/templates/worksell_detail.html
index 26e3c94..8ab8a77 100644
--- a/work_sell/templates/worksell_detail.html
+++ b/work_sell/templates/worksell_detail.html
@@ -41,7 +41,7 @@
             </div>
           {% endif %}
           <div class="col-lg-3">
-            <a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR3">
+            <a href="{% url 'users:contractor-profile' object.contractor.pk %}#open-contact" class="linkReady LR3">
               посмотреть контакты
             </a>
           </div>