diff --git a/issue/migrations/0014_auto_20140815_0517.py b/issue/migrations/0014_auto_20140815_0517.py new file mode 100644 index 0000000..01af39f --- /dev/null +++ b/issue/migrations/0014_auto_20140815_0517.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('issue', '0013_projectpermission_manage_issue'), + ] + + operations = [ + migrations.AddField( + model_name='globalpermission', + name='create_comment', + field=models.BooleanField(default=True), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='create_issue', + field=models.BooleanField(default=True), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='delete_comment', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='delete_issue', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='delete_tags', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='manage_issue', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='manage_project_permission', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='manage_tags', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='modify_comment', + field=models.BooleanField(default=False), + preserve_default=True, + ), + migrations.AddField( + model_name='globalpermission', + name='modify_issue', + field=models.BooleanField(default=False), + preserve_default=True, + ), + ] diff --git a/issue/models.py b/issue/models.py index 368b038..81d37e4 100644 --- a/issue/models.py +++ b/issue/models.py @@ -441,6 +441,8 @@ class PermissionModel(models.Model): @python_2_unicode_compatible class GlobalPermission(PermissionModel): + # Global permissions + create_project = models.BooleanField(default=True) modify_project = models.BooleanField(default=False) delete_project = models.BooleanField(default=False) @@ -450,6 +452,22 @@ class GlobalPermission(PermissionModel): manage_global_permission = models.BooleanField(default=False) + # Project permissions, given on ALL projects + + manage_project_permission = models.BooleanField(default=False) + + create_issue = models.BooleanField(default=True) + modify_issue = models.BooleanField(default=False) + manage_issue = models.BooleanField(default=False) + delete_issue = models.BooleanField(default=False) + + create_comment = models.BooleanField(default=True) + modify_comment = models.BooleanField(default=False) + delete_comment = models.BooleanField(default=False) + + manage_tags = models.BooleanField(default=False) + delete_tags = models.BooleanField(default=False) + def __str__(self): return self.grantee_name + "'s global permissions" diff --git a/issue/templates/issue/global_permission_list.html b/issue/templates/issue/global_permission_list.html index b00a29a..1dd6444 100644 --- a/issue/templates/issue/global_permission_list.html +++ b/issue/templates/issue/global_permission_list.html @@ -2,6 +2,7 @@ {% load django_markdown %} {% load issue_filters %} +{% load issue_tags %} {% block content %} @@ -20,20 +21,37 @@ {% if permissions.count %} - - - - - - + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + {% for perm in permissions %} @@ -45,6 +63,16 @@ + + + + + + + + + +
TypeNameProjectTeamPermissionsTypeNameGlobalProject
Create?Modify?Delete?Add?Manage?Manage?ProjectTeamPermissionsIssuesCommentsTags
{% vertical 'Create?' %}{% vertical 'Modify?' %}{% vertical 'Delete?' %}{% vertical 'Create?' %}{% vertical 'Manage?' %}{% vertical 'Manage?' %}{% vertical 'Manage?' %}{% vertical 'Create?' %}{% vertical 'Manage?' %}{% vertical 'Modify?' %}{% vertical 'Delete?' %}{% vertical 'Create?' %}{% vertical 'Modify?' %}{% vertical 'Delete?' %}{% vertical 'Manage?' %}{% vertical 'Delete?' %}
{{ perm.add_team|boolean }} {{ perm.manage_team|boolean }} {{ perm.manage_global_permission|boolean }}{{ perm.manage_project_permission|boolean }}{{ perm.create_issue|boolean }}{{ perm.manage_issue|boolean }}{{ perm.modify_issue|boolean }}{{ perm.delete_issue|boolean }}{{ perm.create_comment|boolean }}{{ perm.modify_comment|boolean }}{{ perm.delete_comment|boolean }}{{ perm.manage_tags|boolean }}{{ perm.delete_tags|boolean }} Edit Delete