inpt/ponytracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distinct global permission & project permission

Browse source
This commit is contained in:
Élie Bouttier 2014-08-10 15:31:56 -07:00
parent 0a9d0f91e0
commit 805166de05
6 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
issue/fixtures/test_perms.json
View file

File diff suppressed because one or more lines are too long

20
issue/migrations/0010_projectpermission_manage_permission.py Normal file
View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('issue', '0009_auto_20140808_1635'),
]
operations = [
migrations.AddField(
model_name='projectpermission',
name='manage_permission',
field=models.BooleanField(default=False),
preserve_default=True,
),
]

24
issue/migrations/0011_auto_20140810_2225.py Normal file
View file

@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('issue', '0010_projectpermission_manage_permission'),
]
operations = [
migrations.RenameField(
model_name='globalpermission',
old_name='manage_permission',
new_name='manage_global_permission',
),
migrations.RenameField(
model_name='projectpermission',
old_name='manage_permission',
new_name='manage_project_permission',
),
]

4
issue/models.py
View file

@ -414,7 +414,7 @@ class GlobalPermission(PermissionModel):
add_team = models.BooleanField(default=True)
manage_team = models.BooleanField(default=False)
manage_permission = models.BooleanField(default=False)
manage_global_permission = models.BooleanField(default=False)
def __str__(self):
return self.grantee_name + "'s global permissions"
@ -425,6 +425,8 @@ class ProjectPermission(PermissionModel):
project = models.ForeignKey(Project, editable=False,
related_name='permissions')
manage_project_permission = models.BooleanField(default=False)
create_issue = models.BooleanField(default=True)
modify_issue = models.BooleanField(default=False)
delete_issue = models.BooleanField(default=False)

2
issue/templates/issue/global_permission_list.html
View file

@ -44,7 +44,7 @@
<td class="text-center"><a href="{% url 'toggle-global-permission' perm.id 'delete-project' %}">{{ perm.delete_project|boolean }}</a></td>
<td class="text-center"><a href="{% url 'toggle-global-permission' perm.id 'add-team' %}">{{ perm.add_team|boolean }}</a></td>
<td class="text-center"><a href="{% url 'toggle-global-permission' perm.id 'manage-team' %}">{{ perm.manage_team|boolean }}</a></td>
<td class="text-center"><a href="{% url 'toggle-global-permission' perm.id 'manage-permission' %}">{{ perm.manage_permission|boolean }}</a></td>
<td class="text-center"><a href="{% url 'toggle-global-permission' perm.id 'manage-global-permission' %}">{{ perm.manage_global_permission|boolean }}</a></td>
<td class="text-center">
<a href="{% url 'edit-global-permission' perm.id %}"><button class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-edit"></span> Edit</button></a>
<a href="{% url 'delete-global-permission' perm.id %}"><button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span> Delete</button></a>

3
issue/templates/issue/project_permission_list.html
View file

@ -28,6 +28,7 @@
<th colspan="3" class="text-center">Comment</th>
<th colspan="3" class="text-center">Label</th>
<th colspan="3" class="text-center">Milestone</th>
<th class="text-center">Permission</th>
<th rowspan="2" class="col-md-2"></th>
</tr>
<tr>
@ -43,6 +44,7 @@
<th class="text-center">{% vertical 'Create?' %}</th>
<th class="text-center">{% vertical 'Modify?' %}</th>
<th class="text-center">{% vertical 'Delete?' %}</th>
<th class="text-center">{% vertical 'Manage?' %}</th>
</tr>
{% for perm in permissions %}
<tr>
@ -60,6 +62,7 @@
<td class="text-center"><a href="{% url 'toggle-project-permission' project.name perm.id 'create-milestone' %}">{{ perm.create_milestone|boolean }}</a></td>
<td class="text-center"><a href="{% url 'toggle-project-permission' project.name perm.id 'modify-milestone' %}">{{ perm.modify_milestone|boolean }}</a></td>
<td class="text-center"><a href="{% url 'toggle-project-permission' project.name perm.id 'delete-milestone' %}">{{ perm.delete_milestone|boolean }}</a></td>
<td class="text-center"><a href="{% url 'toggle-project-permission' project.name perm.id 'manage-project-permission' %}">{{ perm.manage_project_permission|boolean }}</a></td>
<td class="text-center">
<a href="{% url 'edit-project-permission' project.name perm.id %}"><button class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-edit"></span> Edit</button></a>
<a href="{% url 'delete-project-permission' project.name perm.id %}"><button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span> Delete</button></a>