From 323371300ab3c11c56196983079952de3e18be2c Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Sun, 16 Oct 2016 21:43:55 +0300 Subject: [PATCH] =?UTF-8?q?#PR-55=20=D0=9F=D1=80=D1=8F=D0=BC=D0=BE=D0=B9?= =?UTF-8?q?=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=20robots.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archilance/urls.py | 4 ++++ chat/admin.py | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/archilance/urls.py b/archilance/urls.py index a81eb22..c402dc2 100644 --- a/archilance/urls.py +++ b/archilance/urls.py @@ -47,6 +47,10 @@ urlpatterns = [ 'message': 'Произошла ошибка при оплате', }, name='tmp-payment-fail'), + url(r'^robots\.txt$', TemplateView.as_view(), + {'template': 'robots.txt', 'mimetype': 'text/plain'} + ), + ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) if settings.DEBUG: diff --git a/chat/admin.py b/chat/admin.py index 423d064..90f89c1 100644 --- a/chat/admin.py +++ b/chat/admin.py @@ -16,11 +16,14 @@ class DocumentsAdmin(admin.ModelAdmin): class NewMessageAdmin(admin.ModelAdmin): - list_display = ('user', 'message_pk', 'message_recipent', 'message_order', 'message_team') + list_display = ('user', 'message_pk', 'message_sender', 'message_recipent', 'message_order', 'message_team') def message_pk(self, obj): return obj.message.pk + def message_sender(self,obj): + return obj.message.sender + def message_recipent(self, obj): return obj.message.recipent