From dc730399604d0baa4df8dcfa7f219f8cd63ddfe0 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Thu, 2 Jun 2016 22:53:04 +0300 Subject: [PATCH] hot fix from prod --- conference/views.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/conference/views.py b/conference/views.py index 1e7e39c8..8e9ef448 100644 --- a/conference/views.py +++ b/conference/views.py @@ -406,9 +406,16 @@ class ConferenceDetail(ObjectStatMixin, JitterCacheMixin, MetadataMixin, DetailV slug = self.kwargs.get(self.slug_url_kwarg, None) try: city = City.objects.get(old_url=slug) - return HttpResponseRedirect('/conference/city/%s/'%city.url) - except City.DoesNotExist: - return super(ConferenceDetail, self).dispatch(request, *args, **kwargs) + # return HttpResponseRedirect('/conference/city/%s/'%city.url) + # except City.DoesNotExist: + # return super(ConferenceDetail, self).dispatch(request, *args, **kwargs) + if city: + return HttpResponseRedirect('/conference/city/%s/'%city.url) + except Exception: + try: + return super(ConferenceDetail, self).dispatch(request, *args, **kwargs) + except: + raise Http404('NotFound') def get_context_data(self, **kwargs): context = super(ConferenceDetail, self).get_context_data(**kwargs)