From 6141fdf9b186812df2902b0cdcb943481f8732f8 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Thu, 22 Sep 2016 19:42:03 +0300
Subject: [PATCH 1/3] Filter projects by realty

---
 projects/forms.py                      | 4 +++-
 projects/serializers.py                | 5 +++--
 projects/templates/project_filter.html | 2 +-
 projects/views.py                      | 4 ++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/projects/forms.py b/projects/forms.py
index 7beb824..476efa4 100644
--- a/projects/forms.py
+++ b/projects/forms.py
@@ -35,8 +35,10 @@ class ProjectFilterForm(forms.ModelForm):
         
         fields = (
             'cro',
-            'specialization',
             'work_type',
+            
+            'realty',
+            'specialization',
         )
         
         widgets = {
diff --git a/projects/serializers.py b/projects/serializers.py
index 8c97bdd..33ffff6 100755
--- a/projects/serializers.py
+++ b/projects/serializers.py
@@ -67,11 +67,12 @@ class RealtySerializer(ModelSerializer):
         model = Realty
         
         fields = (
+            'id',
+            'name',
+            
             'building_classification',
             'construction_type',
-            'id',
             'location',
-            'name',
             'user',
         )
 
diff --git a/projects/templates/project_filter.html b/projects/templates/project_filter.html
index 4b85d61..722bdf5 100644
--- a/projects/templates/project_filter.html
+++ b/projects/templates/project_filter.html
@@ -185,7 +185,7 @@
                             {% if project.realty and project.realty.name %}
                                 <ul class="desPro">
                                     <li>
-                                        Объект "{{ project.realty.name }}"
+                                        <a href="?realty={{ project.realty.pk }}">Объект "{{ project.realty.name }}"</a>
                                     </li>
                                 </ul>
                             {% endif %}
diff --git a/projects/views.py b/projects/views.py
index 26b8f1c..3471496 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -288,6 +288,7 @@ class ProjectFilterView(BaseMixin, View):
             cro = form.cleaned_data.get('cro')
             work_type = form.cleaned_data.get('work_type')
             specialization = form.cleaned_data.get('specialization')
+            realty = form.cleaned_data.get('realty')
 
             building_classification = realty_form.cleaned_data.get('building_classification')
             construction_type = realty_form.cleaned_data.get('construction_type')
@@ -322,6 +323,9 @@ class ProjectFilterView(BaseMixin, View):
                     realty__location__lft__gte=location.lft,
                     realty__location__rght__lte=location.rght,
                 )
+            
+            if realty:
+                projects = projects.filter(realty=realty)
 
             order_by = form.cleaned_data.get('order_by')
             last_order_by = form.cleaned_data.get('last_order_by')

From 3c4d2954dbe200515065953e0fcf43ecdcd79df5 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Thu, 22 Sep 2016 19:43:53 +0300
Subject: [PATCH 2/3] Remove local chat ports (8888)

---
 assets/js/chat.js            | 2 +-
 templates/partials/base.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/chat.js b/assets/js/chat.js
index 66235c7..4f06bea 100644
--- a/assets/js/chat.js
+++ b/assets/js/chat.js
@@ -29,7 +29,7 @@ window.confirm = function (message, callback, caption) {
 
 var SocketHandler = function () {
     domain = domain.replace(':' + port, '');
-    var url = 'ws://' + domain + ':8888/chat/' + userId + '/';
+    var url = 'ws://' + domain + '/chat/' + userId + '/';
     var sock = new WebSocket(url);
     var intervalId;
     sock.onopen = function () {
diff --git a/templates/partials/base.html b/templates/partials/base.html
index d57fb43..9211d34 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -86,7 +86,7 @@
 
         if ((queryString.indexOf('/chat') != 0) && (queryString.indexOf('/users/contractor-office/510/work-projects') != 0)) {
             domain = domain.replace(':' + port, '');
-            var url = 'ws://' + domain + ':8888/chat/' + userId + '/';
+            var url = 'ws://' + domain + '/chat/' + userId + '/';
             var sock = new WebSocket(url);
             var intervalId;
             sock.onopen = function () {

From 092d2507830cf1e4758a0d0146daffa2ae38f077 Mon Sep 17 00:00:00 2001
From: PekopT <alex@brilliantov.me>
Date: Thu, 22 Sep 2016 20:39:12 +0300
Subject: [PATCH 3/3] css main fix

---
 assets/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/main.css b/assets/css/main.css
index ff529f7..a48b044 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -5977,7 +5977,7 @@ a.linkS2[data-target="#withdraw-money"]{
     margin-top: 0px;
 }
 .changeBlock {
-    /*min-height: 650px;*/
+    min-height: 500px;
     display: table;
     padding: 143px 20px 120px 20px;
 }