From 0789aed6675292a2ef634b2207afbfe562efdd16 Mon Sep 17 00:00:00 2001
From: Mukhtar <dagdahzub@mail.ru>
Date: Fri, 12 Aug 2016 16:04:57 +0300
Subject: [PATCH] #ARC-16 Fixes websocket url

---
 archilance/settings/base.py         | 8 ++++----
 chat/templates/chat_contractor.html | 8 ++++----
 chat/templates/chat_customer.html   | 5 ++++-
 projects/urls.py                    | 2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/archilance/settings/base.py b/archilance/settings/base.py
index eb857a0..f615008 100644
--- a/archilance/settings/base.py
+++ b/archilance/settings/base.py
@@ -123,10 +123,10 @@ DATABASES = {
 # https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
-    {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'},
-    {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator'},
-    {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'},
-    {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
+    # {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'},
+    # {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator'},
+    # {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'},
+    # {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
 ]
 
 AUTHENTICATION_BACKENDS = (
diff --git a/chat/templates/chat_contractor.html b/chat/templates/chat_contractor.html
index 35e5215..79fbf73 100644
--- a/chat/templates/chat_contractor.html
+++ b/chat/templates/chat_contractor.html
@@ -253,7 +253,10 @@
 
         var SocketHandler = function () {
             var userId = {{ request.user.pk }};
-            var url = 'ws://127.0.0.1:8888/chat/' + userId + '/';
+            var domain = '{{ request.META.HTTP_HOST }}';
+            var port = '{{ request.META.SERVER_PORT }}';
+            domain = domain.replace(':' + port, '');
+            var url = 'ws://' + domain +':8888/chat/' + userId + '/';
             var sock = new WebSocket(url);
             var intervalId;
             sock.onopen = function () {
@@ -581,7 +584,6 @@
 
             });
 
-
             //Добавить сообщение для исполнителей в группе
 
             $("#add-team-chat-message").on('click', function(){
@@ -607,8 +609,6 @@
                     }
                 });
 
-
-
                 $("#team-chat-form #chatText").val("");
             });
 
diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html
index 865a822..e7f4089 100644
--- a/chat/templates/chat_customer.html
+++ b/chat/templates/chat_customer.html
@@ -523,7 +523,10 @@
 
         var userId = '{{ request.user.pk }}';
         var SocketHandler = function () {
-            var url = 'ws://127.0.0.1:8888/chat/' + userId + '/';
+            var domain = '{{ request.META.HTTP_HOST }}';
+            var port = '{{ request.META.SERVER_PORT }}';
+            domain = domain.replace(':' + port, '');
+            var url = 'ws://' + domain +':8888/chat/' + userId + '/';
             var sock = new WebSocket(url);
             var intervalId;
             sock.onopen = function () {
diff --git a/projects/urls.py b/projects/urls.py
index ad497a8..7ad4a16 100644
--- a/projects/urls.py
+++ b/projects/urls.py
@@ -34,7 +34,7 @@ urlpatterns = [
     urls.url(r'^portfolio/(?P<pk>\d+)/edit/$', ContractorPortfolioUpdateView.as_view(), name='contractor-portfolio-edit'),
     
     urls.url(r'^candidate/add/(?P<answer_id>(\d+))/(?P<project_id>(\d+))/$', add_candidate, name='add-candidate'),
-    urls.url(r'^candidate/comparison/(?P<pk>\d+)$', ProjectComparisonView.as_view(), name='comparison'),
+    urls.url(r'^candidate/comparison/(?P<pk>\d+)/$', ProjectComparisonView.as_view(), name='comparison'),
     
     urls.url(r'^offerorder/(?P<answer_id>(\d+))/(?P<project_id>(\d+))/$', OfferOrderView.as_view(), name='offer-order'),