Tickets 83, 88, 89, 90

accounts/edit_forms.py

@@ -74,6 +74,8 @@ class WorkForm(forms.ModelForm):
         fields = ('position', 'company')
 
     def clean_company(self):
+        if not self.cleaned_data.get('company'):
+            return None
         try:
             return Company.objects.get(id=self.cleaned_data['company'])
         except Company.DoesNotExist:

accounts/models.py

@@ -384,7 +384,12 @@ def create_user_inf(sender, instance, created, **kwargs):
 
     calculate_rating(instance)
 
+def post_profile(sender, instance, created, **kwargs):
+    user = instance.user
+    calculate_rating(user)
+
 post_save.connect(create_user_inf, sender=User)
+post_save.connect(post_profile, sender=Profile)
 
 #need import after User Model, because User imported in "organiser.models"
 #from organiser.models import Organiser
@@ -436,34 +441,3 @@ def create_profiles(sender, **kw):
 
 post_save.connect(create_profiles, sender=User)
 '''
-
-"""
-class MyUserAuthBackend(object):
-    def check_md5_password(self, db_password, supplied_password):
-        return  md5(supplied_password).hex_digest(), db_password
-
-    def authenticate(self, username=None, password=None, **kwargs):
-        # Authenticate a user based on email address as the user name.
-        UserModel = get_user_model()
-        if username is None:
-            username = kwargs.get(UserModel.USERNAME_FIELD)
-        try:
-            user = UserModel._default_manager.get_by_natural_key(username)
-            if check_password(password, user.password):
-#                    user.set_password(password)
-#                    user.save()
-                    return user
-            #if user.check_password(password):
-            #    return user
-        except UserModel.DoesNotExist:
-            return None
-
-
-
-    def get_user(self, user_id):
-        try:
-            UserModel = get_user_model()
-            return UserModel._default_manager.get(pk=user_id)
-        except UserModel.DoesNotExist:
-            return None
-"""

company/edit_forms.py

@@ -27,7 +27,7 @@ class NameForm(BaseForm):
 
 class SpecializationForm(BaseForm):
     translation = True
-    specialization = forms.CharField(label=_(u'Описание компании'), widget=forms.TextInput())
+    specialization = forms.CharField(label=_(u'Описание компании'), widget=forms.TextInput(), required=False)
     class Meta:
         model = Company._meta.translations_model
         fields = ('specialization',)
@@ -148,7 +148,7 @@ class DescriptionForm(BaseForm):
 
 class AddressForm(BaseForm):
     translation = True
-    address_inf = forms.CharField(label=_(u'Адрес компании'), widget=forms.TextInput())
+    address_inf = forms.CharField(label=_(u'Адрес компании'), widget=forms.TextInput(), required=False)
     class Meta:
         model = Company._meta.translations_model
         fields = ('address_inf',)

company/models.py

@@ -139,4 +139,11 @@ def create_company(sender, instance, created, **kwargs):
     post_save_handler(sender, instance=instance, **kwargs)
     calculate_rating(instance)
 
+def calculate_rating_for_translations(sender, instance, created, **kwargs):
+    company = instance.master
+    post_save.disconnect(calculate_rating_for_translations, sender=Company._meta.translations_model)
+    calculate_rating(company)
+    post_save.connect(calculate_rating_for_translations, sender=Company._meta.translations_model)
+
 post_save.connect(create_company, sender=Company)
+post_save.connect(calculate_rating_for_translations, sender=Company._meta.translations_model)

templates/client/accounts/feed.html

@@ -76,8 +76,11 @@
         <div class="filter-hint-block" id="filter-hint-block">
             <p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
         </div>
-
+        {% if object_list %}
         {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
+        {% else %}
+            {% trans "Увы, событий, соответствующих выбранным фильтрам, нет в каталоге" %}
+        {% endif %}
 
         {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
         <!--todo: вернуть минификацию-->

templates/registration/activation_complete.html

@@ -1,4 +1,5 @@
 {% extends "base_catalog.html" %}
+{% load i18n %}
 
 {% block title %}Activation complete{% endblock %}
 {% block page_title %}
@@ -8,10 +9,7 @@
     <div class="m-article">
 
             <div class="item-wrap place clearfix">
-                <h1>Congratulations!</h1>
-                <p>Your registration is now complete. Go to the site and start having fun!</p>
-
-
+                {% trans "Поздравляем! Вы успешно прошли регистрацию!" %}
             </div>
 
     </div>