From 09e375654d5e212d73bf29ff711a4a71f0f41cd9 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Fri, 24 Jun 2016 03:24:35 -0400
Subject: [PATCH] Improve verbose name of custom group model. Allow user to be
 created without belonging to an organization, this is used for superusers.

---
 .../migrations/0004_auto_20160611_0645.py     | 34 +++++++++++++++++++
 mayan/apps/user_management/models.py          |  6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 mayan/apps/user_management/migrations/0004_auto_20160611_0645.py

diff --git a/mayan/apps/user_management/migrations/0004_auto_20160611_0645.py b/mayan/apps/user_management/migrations/0004_auto_20160611_0645.py
new file mode 100644
index 0000000000..25a808763e
--- /dev/null
+++ b/mayan/apps/user_management/migrations/0004_auto_20160611_0645.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.contrib.auth.models
+import organizations.shortcuts
+import user_management.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user_management', '0003_auto_20160525_0155'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='mayanuser',
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+                ('on_organization', user_management.models.OrganizationUserManagerHybridClass()),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='mayanuser',
+            name='organization',
+            field=models.ForeignKey(default=organizations.shortcuts.get_current_organization, blank=True, to='organizations.Organization', null=True),
+        ),
+        migrations.AlterField(
+            model_name='mayanuser',
+            name='organization_groups',
+            field=models.ManyToManyField(related_query_name='user', related_name='users', to='user_management.MayanGroup', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='Groups'),
+        ),
+    ]
diff --git a/mayan/apps/user_management/models.py b/mayan/apps/user_management/models.py
index ef271e895c..76dc4a2a29 100644
--- a/mayan/apps/user_management/models.py
+++ b/mayan/apps/user_management/models.py
@@ -18,6 +18,10 @@ class MayanGroup(Group):
     objects = GroupManager()
     on_organization = CurrentOrganizationManager()
 
+    class Meta:
+        verbose_name = _('Group')
+        verbose_name_plural = _('Groups')
+
 
 class OrganizationUserManagerHybridClass(CurrentOrganizationManager, UserManager):
     """
@@ -27,7 +31,7 @@ class OrganizationUserManagerHybridClass(CurrentOrganizationManager, UserManager
 
 class MayanUser(AbstractUser):
     organization = models.ForeignKey(
-        Organization, default=get_current_organization
+        Organization, blank=True, default=get_current_organization, null=True
     )
 
     organization_groups = models.ManyToManyField(