Merge branch 'stage4' into stage5

fixes from 1494	Исправление ошибок

Conflicts:
	support/prod/settings.py

accounts/forms.py

@@ -249,10 +249,11 @@ 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:
+        except (ValueError, ):
-            raise forms.ValidationError(_(u'Пользователь с таким url уже существует'))
+            pass
+        raise forms.ValidationError(_(u'Пользователь с таким url уже существует'))
 
 
 class SocialRegistrationCompleteForm(RegistrationCompleteForm):

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 getattr(obj, 'main_title', None) else '',
         'city': 'city',
         'country': 'country',
 

settings/redirect_views.py

@@ -38,32 +38,35 @@ class TagRedirect(RedirectMixin):
     model = Tag
 
     def get_object_url(self, key, value):
-        Model = self.model
+        obj = self._get_object(value)
-        try:
+        if not obj:
-            obj = Model.objects.get(old_url=value)
+            if value.endswith('-expo'):
-        except Model.DoesNotExist:
+                value = value.replace('-expo', '')
-            try:
+            elif value.endswith('-conf'):
-                obj = Model.objects.get(url=value)
+                value = value.replace('-conf', '')
-            except Model.DoesNotExist:
+        obj = self._get_object(value)
-                if value.endwith('-expo'):
-                    value = value.replace('-expo', '')
-                elif value.endwith('-conf'):
-                    value = value.replace('-conf', '')
-
-                obj = get_object_or_404(old_url=value)
-
         if obj:
             return {key: obj.url}
         else:
             raise Http404
 
+    def _get_object(self, value):
+        obj = None
+        try:
+            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)
+            except self.model.DoesNotExist:
+                pass
+        return obj
 
 
 class CompanyRedirect(RedirectMixin):
     model = Company
 
 
-
 class EventRedirect(object):
 
     def get_object_url(self,key, value):

support/prod/settings.py

@@ -582,5 +582,3 @@ LOGGING = {
         },
     }
 }
-
-

templates/client/includes/conference/conference_object.html

@@ -36,7 +36,7 @@
 				<header>
 					<h1 class="i-title">
 					{% 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 %}

templates/client/includes/conference/conference_paid.html

@@ -44,7 +44,7 @@
 				<header>
 					<h1 class="i-title">
 					{% 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 %}

templates/client/includes/exposition/expo_paid.html

@@ -42,7 +42,7 @@
 				<header>
 					<h1 class="i-title">
 					{% 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 %}

templates/client/includes/exposition/exposition_object.html

@@ -39,7 +39,7 @@
 				<header>
 					<h1 class="i-title">
 					{% 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 %}