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

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;
 }

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 () {

projects/forms.py

@@ -35,8 +35,10 @@ class ProjectFilterForm(forms.ModelForm):
         
         fields = (
             'cro',
-            'specialization',
             'work_type',
+            
+            'realty',
+            'specialization',
         )
         
         widgets = {

projects/serializers.py

@@ -67,11 +67,12 @@ class RealtySerializer(ModelSerializer):
         model = Realty
         
         fields = (
+            'id',
+            'name',
+            
             'building_classification',
             'construction_type',
-            'id',
             'location',
-            'name',
             'user',
         )
 

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 %}

projects/views.py

@@ -289,6 +289,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')
@@ -323,6 +324,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')

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 () {