Task 78,79,80,81

accounts/views.py

@@ -244,7 +244,7 @@ class BaseProfileView(ProfileInvalidView):
     def form_valid(self, form):
         profile = self.request.user.profile
         form = self.form_class(self.request.POST, instance=profile)
-        form.save()
+        profile = form.save()
         response = {'success': True, 'rating': profile.user.rating}
         return HttpResponse(json.dumps(response), content_type='application/json')
 
@@ -276,7 +276,7 @@ class AvatarView(BaseProfileView):
     def form_valid(self, form):
         profile = self.request.user.profile
         form = self.form_class(self.request.POST, self.request.FILES, instance=profile)
-        form.save()
+        profile = form.save()
         if self.request.is_ajax():
             im = get_thumbnail(profile.avatar, '100x100', crop='center')
             response = {'success': True, 'url': im.url, 'rating': profile.user.rating}
@@ -335,7 +335,7 @@ class NameView(ProfileInvalidView):
     def form_valid(self, form):
         user = self.request.user
         form = self.form_class(self.request.POST, instance=user)
-        form.save()
+        user = form.save()
         response = {'success': True, 'rating': user.rating}
 
         return HttpResponse(json.dumps(response), content_type='application/json')

company/edit_views.py

@@ -24,7 +24,7 @@ class BaseView(ProfileInvalidView):
         else:
             form = self.form_class(self.request.POST, instance=company)
 
-        form.save()
+        company = form.save()
         response = {'success': True, 'rating': company.rating}
         return HttpResponse(json.dumps(response), content_type='application/json')
 
@@ -47,7 +47,7 @@ class LogoView(BaseView):
         if company.creator_id != self.request.user.id:
             return HttpResponseForbidden()
         form = self.form_class(self.request.POST, self.request.FILES, instance=company)
-        form.save()
+        company = form.save()
         if self.request.is_ajax():
             im = get_thumbnail(company.logo, '100x100', crop='center')
             response = {'success': True, 'url': im.url, 'rating': company.rating}

registration/backends/default/views.py

@@ -199,7 +199,7 @@ def LogoutView(request):
 def LoginView(request):
     if request.POST:
 
-        form = AuthenticationForm(data=request.POST)
+        form = LoginForm(data=request.POST)
         #return HttpResponse(form.username)
 
 

registration/forms.py

@@ -127,6 +127,28 @@ class RegistrationFormNoFreeEmail(RegistrationForm):
             raise forms.ValidationError(_("Registration using free email addresses is prohibited. Please supply a different email address."))
         return self.cleaned_data['email']
 
+
+from django.contrib.auth import authenticate
 class LoginForm(AuthenticationForm):
-    username = forms.CharField(max_length=254, widget=forms.TextInput(attrs={'placeholder': _(u'Ваш адрес электронной почты')}))
-    password = forms.CharField(label=_("Password"), widget=forms.PasswordInput(attrs={'placeholder': _(u'Ваш Пароль')}))
+    def clean(self):
+        username = self.cleaned_data.get('username')
+        password = self.cleaned_data.get('password')
+
+        if username and password:
+            self.user_cache = authenticate(username=username,
+                                           password=password)
+            if self.user_cache is None:
+                data = self.cleaned_data
+                self._errors['password'] = ErrorList([self.error_messages['invalid_login'] % {
+                        'username': self.username_field.verbose_name
+                    }])
+                del data['password']
+
+                return data
+
+            elif not self.user_cache.is_active:
+                raise forms.ValidationError(self.error_messages['inactive'])
+        self.check_for_test_cookie()
+        return self.cleaned_data
+
+

templates/client/includes/accounts/current_user.html

@@ -56,7 +56,7 @@
                     </div>
                 </div>
             </div>
-            <div class="i-rating" title="Рейтинг: 551">551</div>
+            <div class="i-rating" title="{% trans 'Рейтинг' %}: {{ user.rating }}">{{ user.rating }}</div>
             <div class="reason_block">
                 <p>Заполните свой<br>профиль, чтобы<br>повысить рейтинг</p>
                 <p>Чем выше<br>рейтинг —<br>тем больше<br>преимуществ!</p>

templates/client/includes/company/company_edit.html

@@ -58,7 +58,7 @@
 
 			</div>
 			<!--!!-->
-            <div class="i-rating" title="Рейтинг: 551">551</div>
+            <div class="i-rating" title="{% trans 'Рейтинг' %}: {{ company.rating }}">{{ company.rating }}</div>
         </aside>
 
         <div class="i-info">

templates/client/organiser/add_event.html

@@ -41,12 +41,16 @@
                 <div class="mf-line s-subj-tag">
                     <div class="mf-field">
                         <label>{% trans 'Тематика' %}:</label>
+                        {{ form.theme }}
                         <div class="c-select-box select" data-placeholder="{% trans 'Выберите тематику' %}">
+
                             <div class="csb-selected-items"></div>
                             <div class="csb-menu-wrap">
                                 <div class="scroll-container csb-menu">
                                     <div class="scroll-content clearfix">
+
                                         <ul>
+
                                         {% for val, choice in form.theme.field.choices %}
                                             <li><label><input type="checkbox" name="theme" value="{{ val }}" />{{ choice }}</label></li>
                                         {% endfor %}