From 18bea3eb4803be1a9311af918a803339c06ddb2e Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Fri, 2 Jun 2017 13:51:57 +0300
Subject: [PATCH] =?UTF-8?q?FIXBUG:=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 accounts_app/locale/ru/LC_MESSAGES/django.po |  6 ++++++
 accounts_app/views.py                        | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/accounts_app/locale/ru/LC_MESSAGES/django.po b/accounts_app/locale/ru/LC_MESSAGES/django.po
index ba3578d..16426bd 100644
--- a/accounts_app/locale/ru/LC_MESSAGES/django.po
+++ b/accounts_app/locale/ru/LC_MESSAGES/django.po
@@ -184,3 +184,9 @@ msgstr "Редактировать"
 
 msgid "Set a task"
 msgstr "Дать задачу"
+
+msgid "Empty password, fill it"
+msgstr "Пустой пароль, впишите что-то в пароль"
+
+msgid "New password is empty, fill it"
+msgstr "Новый пароль пустой, придумайте себе пароль"
diff --git a/accounts_app/views.py b/accounts_app/views.py
index b8c8961..910328d 100644
--- a/accounts_app/views.py
+++ b/accounts_app/views.py
@@ -4,7 +4,6 @@ from django.contrib.auth import authenticate, login, logout
 from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import NoReverseMatch
 from django.shortcuts import render, redirect, get_object_or_404, resolve_url
-from django.http import Http404
 from django.contrib.auth.models import Group, Permission
 from django.contrib import messages
 from django.utils.translation import ugettext as _
@@ -129,14 +128,21 @@ def ch_info(request):
         user.telephone = request.POST.get('telephone')
 
         psw = request.POST.get('oldpasswd')
-        if psw != '':
+        if psw != '' and psw is not None:
             if user.check_password(psw):
                 newpasswd = request.POST.get('newpasswd')
-                user.set_password(newpasswd)
+                if newpasswd != '' and newpasswd is not None:
+                    user.set_password(newpasswd)
+                    user.save()
+                    request.user = user
+                    logout(request)
+                    return redirect('acc_app:other_profile', uid=user.pk)
+                else:
+                    messages.error(request, _('New password is empty, fill it'))
             else:
                 messages.error(request, _('Wrong password'))
-        user.save()
-        request.user = user
+        else:
+            messages.warning(request, _('Empty password, fill it'))
 
     return render(request, 'accounts/settings/ch_info.html', {
         'user': request.user