merge user / group / team permissions

permissions/migrations/0003_auto_20140830_2304.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('permissions', '0002_auto_20140829_2335'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='globalpermission',
+            old_name='manage_user',
+            new_name='manage_accounts',
+        ),
+        migrations.RemoveField(
+            model_name='globalpermission',
+            name='manage_group',
+        ),
+        migrations.RemoveField(
+            model_name='globalpermission',
+            name='manage_team',
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='project',
+            field=models.ForeignKey(to='tracker.Project'),
+        ),
+    ]

permissions/models.py

@@ -91,9 +91,7 @@ class GlobalPermission(PermissionModel):
     delete_project = models.BooleanField(default=False)
 
     manage_settings = models.BooleanField(default=False)
-    manage_user = models.BooleanField(default=False)
-    manage_group = models.BooleanField(default=False)
-    manage_team = models.BooleanField(default=False)
+    manage_accounts = models.BooleanField(default=False)
     manage_global_permission = models.BooleanField(default=False)
 
     # Project permissions, given on ALL projects