taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing duplicated permissions introduced in the last commits.

remotes/origin/enhancement/email-actions
Andrey Antukh 2013-04-01 15:54:27 +02:00
parent 6494574ee1
commit 075a67b2a6
6 changed files with 24 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
greenmine/base/fixtures/initial_data.json
View File

@ -249,11 +249,6 @@
"scrum", "scrum",
"issue" "issue"
], ],
[
"can_change_issue",
"scrum",
"issue"
],
[ [
"can_change_issue_state", "can_change_issue_state",
"scrum", "scrum",
@ -269,11 +264,6 @@
"scrum", "scrum",
"issue" "issue"
], ],
[
"can_delete_issue",
"scrum",
"issue"
],
[ [
"can_view_issue", "can_view_issue",
"scrum", "scrum",
@ -339,16 +329,6 @@
"scrum", "scrum",
"milestone" "milestone"
], ],
[
"can_change_milestone",
"scrum",
"milestone"
],
[
"can_delete_milestone",
"scrum",
"milestone"
],
[ [
"can_view_milestone", "can_view_milestone",
"scrum", "scrum",
@ -399,16 +379,6 @@
"scrum", "scrum",
"project" "project"
], ],
[
"can_change_project",
"scrum",
"project"
],
[
"can_delete_project",
"scrum",
"project"
],
[ [
"can_list_projects", "can_list_projects",
"scrum", "scrum",
@ -479,11 +449,6 @@
"scrum", "scrum",
"task" "task"
], ],
[
"can_change_task",
"scrum",
"task"
],
[ [
"can_change_task_state", "can_change_task_state",
"scrum", "scrum",
@ -494,11 +459,6 @@
"scrum", "scrum",
"task" "task"
], ],
[
"can_delete_task",
"scrum",
"task"
],
[ [
"can_view_task", "can_view_task",
"scrum", "scrum",
@ -544,11 +504,6 @@
"scrum", "scrum",
"userstory" "userstory"
], ],
[
"can_change_userstory",
"scrum",
"userstory"
],
[ [
"can_comment_userstory", "can_comment_userstory",
"scrum", "scrum",

9
greenmine/scrum/models.py
View File

@ -141,8 +141,6 @@ class Project(models.Model):
permissions = ( permissions = (
('can_list_projects', 'Can list projects'), ('can_list_projects', 'Can list projects'),
('can_view_project', 'Can view project'), ('can_view_project', 'Can view project'),
('can_change_project', 'Can change project'),
('can_delete_project', 'Can delete project'),
('can_manage_users', 'Can manage users'), ('can_manage_users', 'Can manage users'),
) )
@ -189,8 +187,6 @@ class Milestone(models.Model):
permissions = ( permissions = (
('can_view_milestone', 'Can view milestones'), ('can_view_milestone', 'Can view milestones'),
('can_change_milestone', 'Can change milestones'),
('can_delete_milestone', 'Can delete milestones'),
) )
def __unicode__(self): def __unicode__(self):
@ -234,7 +230,6 @@ class UserStory(models.Model):
('can_comment_userstory', 'Can comment user stories'), ('can_comment_userstory', 'Can comment user stories'),
('can_view_userstory', 'Can view user stories'), ('can_view_userstory', 'Can view user stories'),
('can_change_owned_userstory', 'Can modify owned user stories'), ('can_change_owned_userstory', 'Can modify owned user stories'),
('can_change_userstory', 'Can modify user stories'),
('can_delete_userstory', 'Can delete user stories'), ('can_delete_userstory', 'Can delete user stories'),
('can_add_userstory_to_milestones', 'Can add user stories to milestones'), ('can_add_userstory_to_milestones', 'Can add user stories to milestones'),
) )
@ -318,8 +313,6 @@ class Task(models.Model):
('can_assign_task_to_myself', 'Can assign tasks to myself'), ('can_assign_task_to_myself', 'Can assign tasks to myself'),
('can_change_task_state', 'Can change the task state'), ('can_change_task_state', 'Can change the task state'),
('can_view_task', 'Can view the task'), ('can_view_task', 'Can view the task'),
('can_change_task', 'Can change the task'),
('can_delete_task', 'Can delete the task'),
('can_add_task_to_us', 'Can add tasks to a user story'), ('can_add_task_to_us', 'Can add tasks to a user story'),
) )
@ -378,8 +371,6 @@ class Issue(models.Model):
('can_assign_issue_to_myself', 'Can assign issues to myself'), ('can_assign_issue_to_myself', 'Can assign issues to myself'),
('can_change_issue_state', 'Can change the issue state'), ('can_change_issue_state', 'Can change the issue state'),
('can_view_issue', 'Can view the issue'), ('can_view_issue', 'Can view the issue'),
('can_change_issue', 'Can change the issue'),
('can_delete_issue', 'Can delete the issue'),
) )
def __unicode__(self): def __unicode__(self):

36
greenmine/scrum/permissions.py
View File

@ -2,56 +2,56 @@ from greenmine.base.permissions import BaseDetailPermission
class ProjectDetailPermission(BaseDetailPermission): class ProjectDetailPermission(BaseDetailPermission):
get_permission = "can_view_project" get_permission = "can_view_project"
put_permission = "can_change_project" put_permission = "change_project"
patch_permission = "can_change_project" patch_permission = "change_project"
delete_permission = "can_delete_project" delete_permission = "delete_project"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_project = [] path_to_project = []
class MilestoneDetailPermission(BaseDetailPermission): class MilestoneDetailPermission(BaseDetailPermission):
get_permission = "can_view_milestone" get_permission = "can_view_milestone"
put_permission = "can_change_milestone" put_permission = "change_milestone"
patch_permission = "can_change_milestone" patch_permission = "change_milestone"
delete_permission = "can_delete_milestone" delete_permission = "delete_milestone"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_project = ['project'] path_to_project = ['project']
class UserStoryDetailPermission(BaseDetailPermission): class UserStoryDetailPermission(BaseDetailPermission):
get_permission = "can_view_userstory" get_permission = "can_view_userstory"
put_permission = "can_change_userstory" put_permission = "change_userstory"
patch_permission = "can_change_userstory" patch_permission = "change_userstory"
delete_permission = "can_delete_userstory" delete_permission = "delete_userstory"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_project = ['project'] path_to_project = ['project']
class TaskDetailPermission(BaseDetailPermission): class TaskDetailPermission(BaseDetailPermission):
get_permission = "can_view_task" get_permission = "can_view_task"
put_permission = "can_change_task" put_permission = "change_task"
patch_permission = "can_change_task" patch_permission = "change_task"
delete_permission = "can_delete_task" delete_permission = "delete_task"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_project = ['project'] path_to_project = ['project']
class IssueDetailPermission(BaseDetailPermission): class IssueDetailPermission(BaseDetailPermission):
get_permission = "can_view_issue" get_permission = "can_view_issue"
put_permission = "can_change_issue" put_permission = "change_issue"
patch_permission = "can_change_issue" patch_permission = "change_issue"
delete_permission = "can_delete_issue" delete_permission = "can_delete_issue"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_project = ['project'] path_to_project = ['project']
class ChangeDetailPermission(BaseDetailPermission): class ChangeDetailPermission(BaseDetailPermission):
get_permission = "can_view_change" get_permission = "can_view_change"
put_permission = "can_change_change" put_permission = "change_change"
patch_permission = "can_change_change" patch_permission = "change_change"
delete_permission = "can_delete_change" delete_permission = "can_delete_change"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_project = ['project'] path_to_project = ['project']
class ChangeAttachmentDetailPermission(BaseDetailPermission): class ChangeAttachmentDetailPermission(BaseDetailPermission):
get_permission = "can_view_changeattachment" get_permission = "can_view_changeattachment"
put_permission = "can_change_changeattachment" put_permission = "change_changeattachment"
patch_permission = "can_change_changeattachment" patch_permission = "change_changeattachment"
delete_permission = "can_delete_changeattachment" delete_permission = "can_delete_changeattachment"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_project = ['change', 'project'] path_to_project = ['change', 'project']

4
greenmine/wiki/models.py
View File

@ -11,10 +11,9 @@ class WikiPage(models.Model):
watchers = models.ManyToManyField('base.User', watchers = models.ManyToManyField('base.User',
related_name='wikipage_watchers', related_name='wikipage_watchers',
null=True) null=True, blank=True)
created_date = models.DateTimeField(auto_now_add=True) created_date = models.DateTimeField(auto_now_add=True)
tags = DictField()
class Meta: class Meta:
permissions = ( permissions = (
@ -30,4 +29,3 @@ class WikiPageAttachment(models.Model):
modified_date = models.DateTimeField(auto_now_add=True) modified_date = models.DateTimeField(auto_now_add=True)
attached_file = models.FileField(upload_to="files/wiki", max_length=500, attached_file = models.FileField(upload_to="files/wiki", max_length=500,
null=True, blank=True) null=True, blank=True)
tags = DictField()

6
greenmine/wiki/permissions.py
View File

@ -2,14 +2,16 @@ from greenmine.base.permissions import BaseDetailPermission
class WikiPageDetailPermission(BaseDetailPermission): class WikiPageDetailPermission(BaseDetailPermission):
get_permission = "can_view_wikipage" get_permission = "can_view_wikipage"
put_permission = "can_change_wikipage" put_permission = "change_wikipage"
patch_permission = "change_wikipage"
delete_permission = "can_delete_wikipage" delete_permission = "can_delete_wikipage"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_document = [] path_to_document = []
class WikiPageAttachmentDetailPermission(BaseDetailPermission): class WikiPageAttachmentDetailPermission(BaseDetailPermission):
get_permission = "can_view_wikipageattachment" get_permission = "can_view_wikipageattachment"
put_permission = "can_change_wikipageattachment" put_permission = "change_wikipageattachment"
patch_permission = "change_wikipageattachment"
delete_permission = "can_delete_wikipageattachment" delete_permission = "can_delete_wikipageattachment"
safe_methods = ['HEAD', 'OPTIONS'] safe_methods = ['HEAD', 'OPTIONS']
path_to_document = [] path_to_document = []

2
greenmine/wiki/urls.py
View File

@ -5,7 +5,7 @@ from greenmine.wiki import api
urlpatterns = format_suffix_patterns(patterns('', urlpatterns = format_suffix_patterns(patterns('',
url(r'^wiki_pages/$', api.WikiPageList.as_view(), name='wiki-page-list'), url(r'^wiki_pages/$', api.WikiPageList.as_view(), name='wiki-page-list'),
url(r'^wiki_pages/(?P<pk>[0-9]+)/$', api.WikiPageDetail.as_view(), name='wiki-page-detail'), url(r'^wiki_pages/(?P<slug>[\w\-\d]+)/$', api.WikiPageDetail.as_view(), name='wiki-page-detail'),
url(r'^wiki_page_attachments/$', api.WikiPageAttachmentList.as_view(), name='wiki-page-attachment-list'), url(r'^wiki_page_attachments/$', api.WikiPageAttachmentList.as_view(), name='wiki-page-attachment-list'),
url(r'^wiki_page_attachments/(?P<pk>[0-9]+)/$', api.WikiPageAttachmentDetail.as_view(), name='wiki-page-attachment-detail'), url(r'^wiki_page_attachments/(?P<pk>[0-9]+)/$', api.WikiPageAttachmentDetail.as_view(), name='wiki-page-attachment-detail'),
)) ))