From 67a1d918ee59aafcb8f3a6184d74f4fbe149bb7d Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Wed, 10 Aug 2016 18:14:33 +0300 Subject: [PATCH] #ARC-27 database dbname rename fix --- archilance/settings/base.py | 2 +- chat/templates/chat_customer.html | 12 +++++++++--- chat/testapp.py | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 0600cb5..9b25660 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -111,7 +111,7 @@ WSGI_APPLICATION = 'archilance.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'archilance2', + 'NAME': 'archilance', 'USER': 'postgres', 'PASSWORD': 'postgres', 'HOST': 'localhost', diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index 3220cc2..5f8f066 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -272,7 +272,7 @@ $.each(json.results, function (i, v) { if (v.status == "not_agreed") { htmlInbox += '
' + - '

Этап

' + + '

Этап

' + '' + '' + '' + @@ -334,6 +334,8 @@ }); $(".update-stages-form").each(function(i,v){ + var currentStageId = parseInt($(this).attr('data-order-id')); + alert(currentStageId); $.ajax({ url: '/api/stages/' + currentStageId + '/', type: 'PUT', @@ -345,10 +347,14 @@ success: function(json){ console.log(json); }, + error: function(e){ + console.log('error'); + console.log(e); + } + }); + }); - }) - }); var currentOrderId = $(this).attr('data-order-id'); diff --git a/chat/testapp.py b/chat/testapp.py index 0922d45..fe64028 100644 --- a/chat/testapp.py +++ b/chat/testapp.py @@ -92,7 +92,7 @@ if __name__ == '__main__': ioloop = IOLoop.instance() application.db = momoko.Pool( - dsn='dbname=archilance2 user=postgres password=postgres host=localhost', + dsn='dbname=archilance user=postgres password=postgres host=localhost', size=1, ioloop=ioloop, )