improve views and templates permissions managment

permissions/backends.py

@@ -7,7 +7,7 @@ from permissions.models import GlobalPermission
 def user_has_perm(user, perm, perms):
     for p in perms:
         # this perm allow that action and the user is concerned by this perm
-        if hasattr(p, perm) and getattr(p, perm) and p.granted_to(user):
+        if perm in p.all_perms and getattr(p, perm) and p.granted_to(user):
             return True
 
 

permissions/migrations/0005_auto_20140902_0521.py

@@ -0,0 +1,150 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import permissions.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('permissions', '0004_auto_20140830_2318'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='access_project',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='create_comment',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='create_issue',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='create_project',
+            field=permissions.models.GlobalPermissionField(default=True, verbose_name='Create project'),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='delete_comment',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='delete_issue',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='delete_project',
+            field=permissions.models.GlobalPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='delete_tags',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='manage_accounts',
+            field=permissions.models.GlobalPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='manage_global_permission',
+            field=permissions.models.GlobalPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='manage_issue',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='manage_project_permission',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='manage_settings',
+            field=permissions.models.GlobalPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='manage_tags',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='modify_comment',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='modify_issue',
+            field=permissions.models.ProjectPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='globalpermission',
+            name='modify_project',
+            field=permissions.models.GlobalPermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='create_comment',
+            field=permissions.models.PermissionField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='create_issue',
+            field=permissions.models.PermissionField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='delete_comment',
+            field=permissions.models.PermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='delete_issue',
+            field=permissions.models.PermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='delete_tags',
+            field=permissions.models.PermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='manage_issue',
+            field=permissions.models.PermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='manage_project_permission',
+            field=permissions.models.PermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='manage_tags',
+            field=permissions.models.PermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='modify_comment',
+            field=permissions.models.PermissionField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='projectpermission',
+            name='modify_issue',
+            field=permissions.models.PermissionField(default=False),
+        ),
+    ]

permissions/models.py

@@ -10,6 +10,19 @@ from accounts.models import *
 __all__ = ['GlobalPermission', 'ProjectPermission']
 
 
+@python_2_unicode_compatible
+class PermissionField(models.BooleanField):
+    pass
+
+
+class GlobalPermissionField(PermissionField):
+    pass
+
+
+class ProjectPermissionField(PermissionField):
+    pass
+
+
 @python_2_unicode_compatible
 class PermissionModel(models.Model):
 
@@ -66,6 +79,18 @@ class PermissionModel(models.Model):
         else:
             return False
 
+    @property
+    def all_perms(self):
+        for field in self._meta.fields:
+            if isinstance(field, PermissionField):
+                yield field.name
+
+    @property
+    def all_perms_fields_values(self):
+        for field in self._meta.fields:
+            if isinstance(field, PermissionField):
+                yield (field, getattr(self, field.name))
+
     @property
     def type(self):
         return self.get_grantee_type_display()
@@ -84,33 +109,62 @@ class GlobalPermission(PermissionModel):
     class Meta:
         unique_together = ('grantee_type', 'grantee_id')
 
+    @property
+    def global_perms_fields_values(self):
+        for field in self._meta.fields:
+            if isinstance(field, GlobalPermissionField):
+                yield (field, getattr(self, field.name))
+
+    @property
+    def project_perms_fields_values(self):
+        for field in self._meta.fields:
+            if isinstance(field, ProjectPermissionField):
+                yield (field, getattr(self, field.name))
+
     # Global permissions
 
-    create_project = models.BooleanField(default=True)
+    create_project = GlobalPermissionField(default=True,
-    modify_project = models.BooleanField(default=False)
+            verbose_name='Create project')
-    delete_project = models.BooleanField(default=False)
+    modify_project = GlobalPermissionField(default=False,
+            verbose_name='Modify project')
+    delete_project = GlobalPermissionField(default=False,
+            verbose_name='Delete project')
 
-    manage_settings = models.BooleanField(default=False)
+    manage_settings = GlobalPermissionField(default=False,
-    manage_accounts = models.BooleanField(default=False)
+            verbose_name='Manage settings')
-    manage_global_permission = models.BooleanField(default=False)
+    manage_accounts = GlobalPermissionField(default=False,
+            verbose_name='Manage users, groups and teams')
+    manage_global_permission = GlobalPermissionField(default=False,
+            verbose_name='Manage global permissions')
 
     # Project permissions, given on ALL projects
 
-    access_project = models.BooleanField(default=False)
+    access_project = ProjectPermissionField(default=False,
+            verbose_name='Access all project')
 
-    create_issue = models.BooleanField(default=False)
+    create_issue = ProjectPermissionField(default=False,
-    modify_issue = models.BooleanField(default=False)
+            verbose_name='Create issue')
-    manage_issue = models.BooleanField(default=False)
+    modify_issue = ProjectPermissionField(default=False,
-    delete_issue = models.BooleanField(default=False)
+            verbose_name='Modify issue')
+    manage_issue = ProjectPermissionField(default=False,
+            verbose_name='Manage issue')
+    delete_issue = ProjectPermissionField(default=False,
+            verbose_name='Delete issue')
 
-    create_comment = models.BooleanField(default=False)
+    create_comment = ProjectPermissionField(default=False,
-    modify_comment = models.BooleanField(default=False)
+            verbose_name='Create comment')
-    delete_comment = models.BooleanField(default=False)
+    modify_comment = ProjectPermissionField(default=False,
+            verbose_name='Modify comment')
+    delete_comment = ProjectPermissionField(default=False,
+            verbose_name='Delete comment')
 
-    manage_tags = models.BooleanField(default=False)
+    manage_tags = ProjectPermissionField(default=False,
-    delete_tags = models.BooleanField(default=False)
+            verbose_name='Assign and remove labels and milestones')
+    delete_tags = ProjectPermissionField(default=False,
+            verbose_name='Delete labels and milestones')
 
-    manage_project_permission = models.BooleanField(default=False)
+    manage_project_permission = ProjectPermissionField(default=False,
+            verbose_name='Manage project permissions')
 
     def __str__(self):
         return self.grantee.__str__() + "'s global permissions"
@@ -124,19 +178,29 @@ class ProjectPermission(PermissionModel):
 
     project = models.ForeignKey(Project, related_name='permissions')
 
-    manage_project_permission = models.BooleanField(default=False)
+    create_issue = PermissionField(default=False,
+            verbose_name='Create issue')
+    modify_issue = PermissionField(default=False,
+            verbose_name='Modify issue')
+    manage_issue = PermissionField(default=False,
+            verbose_name='Manage issue')
+    delete_issue = PermissionField(default=False,
+            verbose_name='Delete issue')
 
-    create_issue = models.BooleanField(default=True)
+    create_comment = PermissionField(default=False,
-    modify_issue = models.BooleanField(default=False)
+            verbose_name='Create comment')
-    manage_issue = models.BooleanField(default=False)
+    modify_comment = PermissionField(default=False,
-    delete_issue = models.BooleanField(default=False)
+            verbose_name='Modify comment')
+    delete_comment = PermissionField(default=False,
+            verbose_name='Delete comment')
 
-    create_comment = models.BooleanField(default=True)
+    manage_tags = PermissionField(default=False,
-    modify_comment = models.BooleanField(default=False)
+            verbose_name='Assign and remove labels and milestones')
-    delete_comment = models.BooleanField(default=False)
+    delete_tags = PermissionField(default=False,
+            verbose_name='Delete labels and milestones')
 
-    manage_tags = models.BooleanField(default=False)
+    manage_project_permission = PermissionField(default=False,
-    delete_tags = models.BooleanField(default=False)
+            verbose_name='Manage project permissions')
 
     def __str__(self):
         return self.grantee.__str__() + "'s permissions on " \

permissions/urls.py

@@ -7,11 +7,11 @@ urlpatterns = [
     url(r'^admin/permissions/add/$', 'permissions.views.global_perm_edit', name='add-global-permission'),
     url(r'^admin/permissions/(?P<id>[0-9]+)/edit/$', 'permissions.views.global_perm_edit', name='edit-global-permission'),
     url(r'^admin/permissions/(?P<id>[0-9]+)/delete/$', 'permissions.views.global_perm_delete', name='delete-global-permission'),
-    url(r'^admin/permissions/(?P<id>[0-9]+)/toggle/(?P<perm>[a-z-]+)/$', 'permissions.views.global_perm_toggle', name='toggle-global-permission'),
+    url(r'^admin/permissions/(?P<id>[0-9]+)/toggle/(?P<perm>[a-z_]+)/$', 'permissions.views.global_perm_toggle', name='toggle-global-permission'),
     # Project permissions
     url(r'^(?P<project>[-\w]+)/permissions/$', 'permissions.views.project_perm_list', name='list-project-permission'),
     url(r'^(?P<project>[-\w]+)/permissions/add/$', 'permissions.views.project_perm_edit', name='add-project-permission'),
     url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/edit/$', 'permissions.views.project_perm_edit', name='edit-project-permission'),
     url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/delete/$', 'permissions.views.project_perm_delete', name='delete-project-permission'),
-    url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/toggle/(?P<perm>[a-z-]+)/$', 'permissions.views.project_perm_toggle', name='toggle-project-permission'),
+    url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/toggle/(?P<perm>[a-z_]+)/$', 'permissions.views.project_perm_toggle', name='toggle-project-permission'),
 ]

permissions/views.py

@@ -56,17 +56,12 @@ def global_perm_delete(request, id):
 @project_perm_required('manage_global_permission')
 def global_perm_toggle(request, id, perm):
     permission = get_object_or_404(GlobalPermission, id=id)
-    # to be sure to dont modify other attribut with the following trick
+    if perm not in permission.all_perms:
-    if '-' not in perm:
-        raise Http404
-    perm = perm.replace('-', '_')
-    if hasattr(permission, perm):
-        state = not getattr(permission, perm)
-        setattr(permission, perm, state)
-        permission.save()
-        return HttpResponse('1' if state else '0')
-    else:
         raise Http404
+    state = not getattr(permission, perm)
+    setattr(permission, perm, state)
+    permission.save()
+    return HttpResponse('1' if state else '0')
 
 
 @project_perm_required('manage_project_permission')
@@ -119,14 +114,9 @@ def project_perm_delete(request, project, id):
 @project_perm_required('manage_project_permission')
 def project_perm_toggle(request, project, id, perm):
     permission = get_object_or_404(ProjectPermission, project=project, id=id)
-    # to be sure to dont modify other attribut with the following trick
+    if perm not in permission.all_perms:
-    if '-' not in perm:
-        raise Http404
-    perm = perm.replace('-', '_')
-    if hasattr(permission, perm):
-        state = not getattr(permission, perm)
-        setattr(permission, perm, state)
-        permission.save()
-        return HttpResponse('1' if state else '0')
-    else:
         raise Http404
+    state = not getattr(permission, perm)
+    setattr(permission, perm, state)
+    permission.save()
+    return HttpResponse('1' if state else '0')

templates/permissions/global_perm_list.html

@@ -38,82 +38,22 @@
       <div class="tab-content">
         <div class="tab-pane active" id="global{{ perm.id }}">
           <ul class="list-group">
+            {% for p, v in perm.global_perms_fields_values %}
             <li class="list-group-item">
-              Create project
+              {{ p.verbose_name }}
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'create-project' %}">{{ perm.create_project|boolean }}</a>
+              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id p.name %}">{{ v|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Modify projects
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'modify-project' %}">{{ perm.modify_project|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Delete projects
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'delete-project' %}">{{ perm.delete_project|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Manage settings
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-settings' %}">{{ perm.manage_settings|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Manage users, groups and teams
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-accounts' %}">{{ perm.manage_accounts|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Manage permissions
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-global-permission' %}">{{ perm.manage_global_permission|boolean }}</a>
             </li>
+            {% endfor %}
           </ul>
         </div>
         <div class="tab-pane" id="project{{ perm.id }}">
           <ul class="list-group">
+            {% for p, v in perm.project_perms_fields_values %}
             <li class="list-group-item">
-              Access
+              {{ p.verbose_name }}
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'access-project' %}">{{ perm.access_project|boolean }}</a>
+              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id p.name %}">{{ v|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Create issue
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'create-issue' %}">{{ perm.create_issue|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Manage issue
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'modify-issue' %}">{{ perm.manage_issue|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Modify issue
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-issue' %}">{{ perm.modify_issue|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Delete issue
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'delete-issue' %}">{{ perm.delete_issue|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Create comment
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'create-comment' %}">{{ perm.create_comment|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Modify comment
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'modify-comment' %}">{{ perm.modify_comment|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Delete comment
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'delete-comment' %}">{{ perm.delete_comment|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Manage tags
-              &#160;
-              <span class="text-muted">create, assign and remove labels and milestones</span>
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-tags' %}">{{ perm.manage_tags|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Delete tags
-              &#160;
-              <span class="text-muted">delete labels and milestones</span>
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'delete-tags' %}">{{ perm.delete_tags|boolean }}</a>
-            </li>
-            <li class="list-group-item">
-              Manage permissions
-              <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-project-permission' %}">{{ perm.manage_project_permission|boolean }}</a>
             </li>
+            {% endfor %}
           </ul>
         </div>
       </div>

templates/permissions/project_perm_list.html

@@ -33,46 +33,12 @@
   <div class="panel-collapse collapse" id="collapse{{ perm.id }}">
     <div class="panel-body">
       <ul class="list-group">
+        {% for p, v in perm.all_perms_fields_values %}
         <li class="list-group-item">
-          Create issue
+          {{ p.verbose_name }}
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'create-issue' %}">{{ perm.create_issue|boolean }}</a>
+          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id p.name %}">{{ v|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Manage issue
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'modify-issue' %}">{{ perm.manage_issue|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Modify issue
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'manage-issue' %}">{{ perm.modify_issue|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Delete issue
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'delete-issue' %}">{{ perm.delete_issue|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Create comment
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'create-comment' %}">{{ perm.create_comment|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Modify comment
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'modify-comment' %}">{{ perm.modify_comment|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Delete comment
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'delete-comment' %}">{{ perm.delete_comment|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Manage tags
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'manage-tags' %}">{{ perm.manage_tags|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Delete tags
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'delete-tags' %}">{{ perm.delete_tags|boolean }}</a>
-        </li>
-        <li class="list-group-item">
-          Manage permissions
-          <a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-project-permission' project.name perm.id 'manage-project-permission' %}">{{ perm.manage_project_permission|boolean }}</a>
         </li>
+        {% endfor %}
       </ul>
     </div>
   </div>