Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

accounts/models.py

@@ -132,8 +132,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     translator = models.ForeignKey('translator.Translator', verbose_name='Переводчик', blank=True, null=True,
                                    unique=True,
                                   on_delete=models.PROTECT, related_name='user')
-    company = models.ForeignKey('company.Company', blank=True, null=True,
-                                on_delete=models.PROTECT, related_name='users')
+    company = models.ForeignKey('company.Company', blank=True, null=True, related_name='users')
     position = models.CharField(verbose_name='Должность', max_length=255, blank=True)
 
     objects = UserManager()

proj/urls.py

@@ -72,7 +72,8 @@ urlpatterns = patterns('',
 # test urls
 from accounts.models import User
 def delete_user(request):
-    User.objects.filter(email='kotzillla@gmail.com').delete()
+    request.user.delete()
+    #User.objects.filter(email='kotzillla@gmail.com').delete()
     return HttpResponse('deleted')
 
 def delete_user_info(request):