From 50f559328b68338698848d1d9e3bc8f4272c4414 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 11:53:02 +0300 Subject: [PATCH 1/9] fix for |safe template tag --- templates/client/includes/conference/conference_object.html | 2 +- templates/client/includes/conference/conference_paid.html | 2 +- templates/client/includes/exposition/expo_paid.html | 2 +- templates/client/includes/exposition/exposition_object.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/client/includes/conference/conference_object.html b/templates/client/includes/conference/conference_object.html index 964cf33a..763f9363 100644 --- a/templates/client/includes/conference/conference_object.html +++ b/templates/client/includes/conference/conference_object.html @@ -36,7 +36,7 @@

{% if event.main_title %} - {{ event.name|safe }} - {{ event.main_title|safe|lowfirst }} + {{ event.name|safe }} - {{ event.main_title|lowfirst|safe }} {% else %} {{ event.name|safe }} {% endif %} diff --git a/templates/client/includes/conference/conference_paid.html b/templates/client/includes/conference/conference_paid.html index 5f7b011f..1d199237 100644 --- a/templates/client/includes/conference/conference_paid.html +++ b/templates/client/includes/conference/conference_paid.html @@ -44,7 +44,7 @@

{% if event.main_title %} - {{ event.name|safe }} - {{ event.main_title|safe|lowfirst }} + {{ event.name|safe }} - {{ event.main_title|lowfirst|safe }} {% else %} {{ event.name|safe }} {% endif %} diff --git a/templates/client/includes/exposition/expo_paid.html b/templates/client/includes/exposition/expo_paid.html index 00fcc954..2972441c 100644 --- a/templates/client/includes/exposition/expo_paid.html +++ b/templates/client/includes/exposition/expo_paid.html @@ -42,7 +42,7 @@

{% if exposition.main_title %} - {{ exposition.name|safe }} - {{ exposition.main_title|safe|lowfirst }} + {{ exposition.name|safe }} - {{ exposition.main_title|lowfirst|safe }} {% else %} {{ exposition.name|safe }} {% endif %} diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index 51d69919..ef78e628 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -39,7 +39,7 @@

{% if exposition.main_title %} - {{ exposition.name|safe }} - {{ exposition.main_title|safe|lowfirst }} + {{ exposition.name|safe }} - {{ exposition.main_title|lowfirst|safe }} {% else %} {{ exposition.name|safe }} {% endif %} From e92f5e274370e980e9a73d0f0e00f547afe3959a Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 12:20:12 +0300 Subject: [PATCH 2/9] fix for: AttributeError at /members/rvc/ 'Company' object has no attribute 'main_title' --- meta/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/models.py b/meta/models.py index 972d540a..317df3de 100644 --- a/meta/models.py +++ b/meta/models.py @@ -63,7 +63,7 @@ class MetaSetting(TranslatableModel): object_params = { 'object_name': 'name', 'object_title': 'main_title', - 'object_title_l': lambda obj: obj.main_title[:1].lower() + obj.main_title[1:] if obj.main_title else '', + 'object_title_l': lambda obj: getattr(obj, 'main_title', '')[:1].lower() + getattr(obj, 'main_title', '')[1:] if obj.main_title else '', 'city': 'city', 'country': 'country', From 4c12083618a14b9d86efea27a492854c49f1f7ad Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 12:23:53 +0300 Subject: [PATCH 3/9] fix for: AttributeError at /members/rvc/ 'Company' object has no attribute 'main_title' --- meta/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/models.py b/meta/models.py index 317df3de..b8ccdd2a 100644 --- a/meta/models.py +++ b/meta/models.py @@ -63,7 +63,7 @@ class MetaSetting(TranslatableModel): object_params = { 'object_name': 'name', 'object_title': 'main_title', - 'object_title_l': lambda obj: getattr(obj, 'main_title', '')[:1].lower() + getattr(obj, 'main_title', '')[1:] if obj.main_title else '', + 'object_title_l': lambda obj: getattr(obj, 'main_title', '')[:1].lower() + getattr(obj, 'main_title', '')[1:] if getattr(obj, 'main_title') else '', 'city': 'city', 'country': 'country', From 15a4cce0458cf17503f8195f9e4f541b5ca0b796 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 12:26:13 +0300 Subject: [PATCH 4/9] fix for: AttributeError at /members/rvc/ 'Company' object has no attribute 'main_title' --- meta/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/models.py b/meta/models.py index b8ccdd2a..c0002aa1 100644 --- a/meta/models.py +++ b/meta/models.py @@ -63,7 +63,7 @@ class MetaSetting(TranslatableModel): object_params = { 'object_name': 'name', 'object_title': 'main_title', - 'object_title_l': lambda obj: getattr(obj, 'main_title', '')[:1].lower() + getattr(obj, 'main_title', '')[1:] if getattr(obj, 'main_title') else '', + 'object_title_l': lambda obj: getattr(obj, 'main_title', '')[:1].lower() + getattr(obj, 'main_title', '')[1:] if getattr(obj, 'main_title', None) else '', 'city': 'city', 'country': 'country', From c4fde7b82ea9d30b3670305d6572a3d601f952ac Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 12:43:03 +0300 Subject: [PATCH 5/9] settings default logger changed --- support/prod/settings.py | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/support/prod/settings.py b/support/prod/settings.py index f4954e94..679749e6 100644 --- a/support/prod/settings.py +++ b/support/prod/settings.py @@ -549,5 +549,36 @@ if DEBUG: ] - - +# logging +U_LOGFILE_SIZE = 1 * 1024 * 1024 +U_LOGFILE_COUNT = 2 +DEFAULT_LOGGER_NAME = 'django' +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + 'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s \n' + }, + 'simple': { + 'format': '%(levelname)s %(message)s' + }, + }, + 'handlers': { + 'file': { + 'level': 'INFO', + 'filename': os.path.join(SITE_ROOT, 'logs/django.log'), + 'formatter': 'verbose', + 'class':'logging.handlers.RotatingFileHandler', + 'maxBytes': U_LOGFILE_SIZE, + 'backupCount': U_LOGFILE_COUNT, + }, + }, + 'loggers': { + 'django': { + 'handlers': ['file'], + 'propagate': True, + 'level': 'DEBUG', + }, + } +} From f4705456076f805234c97a3db1d0d008306909eb Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 13:16:41 +0300 Subject: [PATCH 6/9] =?UTF-8?q?fir=20bug=20in=201395:=20=D0=AD=D1=82=D0=B0?= =?UTF-8?q?=D0=BF=20=E2=84=964=20-=20=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D1=83=D0=BD=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20username?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- accounts/forms.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/accounts/forms.py b/accounts/forms.py index c7e3443d..b033330a 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -249,10 +249,9 @@ class RegistrationCompleteForm(forms.ModelForm): try: User.objects.get(url=url) User.objects.get(id=int(url)) - except (User.DoesNotExist, ValueError, ): + except (User.DoesNotExist,): return url - else: - raise forms.ValidationError(_(u'Пользователь с таким url уже существует')) + raise forms.ValidationError(_(u'Пользователь с таким url уже существует')) class SocialRegistrationCompleteForm(RegistrationCompleteForm): From 46b563e862cf6adf96e3ae8b7d69b59eec52210e Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 13:25:25 +0300 Subject: [PATCH 7/9] =?UTF-8?q?fix=20bug=20for=201395:=20=D0=AD=D1=82?= =?UTF-8?q?=D0=B0=D0=BF=20=E2=84=964=20-=20=D0=9F=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D1=83=D0=BD=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20username?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- accounts/forms.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/accounts/forms.py b/accounts/forms.py index b033330a..4a140777 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -251,6 +251,8 @@ class RegistrationCompleteForm(forms.ModelForm): User.objects.get(id=int(url)) except (User.DoesNotExist,): return url + except (ValueError, ): + pass raise forms.ValidationError(_(u'Пользователь с таким url уже существует')) From 49bc73f46e3b6cad9975538576dbba9aff002605 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 13:42:12 +0300 Subject: [PATCH 8/9] =?UTF-8?q?fix=20error=20for:=201494:=20=D0=98=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20https://expomap.ru/tag/medicin?= =?UTF-8?q?skoe-oborydovanie/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings/redirect_views.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/settings/redirect_views.py b/settings/redirect_views.py index 67df53d2..85b31b06 100644 --- a/settings/redirect_views.py +++ b/settings/redirect_views.py @@ -38,32 +38,34 @@ class TagRedirect(RedirectMixin): model = Tag def get_object_url(self, key, value): - Model = self.model - try: - obj = Model.objects.get(old_url=value) - except Model.DoesNotExist: - try: - obj = Model.objects.get(url=value) - except Model.DoesNotExist: - if value.endwith('-expo'): - value = value.replace('-expo', '') - elif value.endwith('-conf'): - value = value.replace('-conf', '') - - obj = get_object_or_404(old_url=value) - + obj = self._get_object(value) + if not obj: + if value.endswith('-expo'): + value = value.replace('-expo', '') + elif value.endswith('-conf'): + value = value.replace('-conf', '') + obj = self._get_object(value) if obj: return {key: obj.url} else: raise Http404 + def _get_object(self, value): + obj = None + try: + obj = self.model.objects.get(old_url=value) + except self.model.DoesNotExist: + try: + obj = self.model.objects.get(url=value) + except self.model.DoesNotExist: + pass + return obj class CompanyRedirect(RedirectMixin): model = Company - class EventRedirect(object): def get_object_url(self,key, value): @@ -173,4 +175,4 @@ def old_profile(request): if user.is_authenticated(): return HttpResponseRedirect('/%s/'%user.url) else: - raise Http404 \ No newline at end of file + raise Http404 From 31f84fa248ef822161459d7a3c8c48aebaf57918 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 1 Aug 2016 13:55:49 +0300 Subject: [PATCH 9/9] =?UTF-8?q?fix=20error=20for:=201494:=20=D0=98=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20https://expomap.ru/tag/medicin?= =?UTF-8?q?skoe-oborydovanie/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings/redirect_views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/settings/redirect_views.py b/settings/redirect_views.py index 85b31b06..968728ed 100644 --- a/settings/redirect_views.py +++ b/settings/redirect_views.py @@ -53,7 +53,8 @@ class TagRedirect(RedirectMixin): def _get_object(self, value): obj = None try: - obj = self.model.objects.get(old_url=value) + if self.model.objects.filter(old_url__icontains=value).exists(): + obj = self.model.objects.filter(old_url__icontains=value)[0] except self.model.DoesNotExist: try: obj = self.model.objects.get(url=value)