diff --git a/greenmine/base/fixtures/initial_data.json b/greenmine/base/fixtures/initial_data.json index d6a0621b..1603ac21 100644 --- a/greenmine/base/fixtures/initial_data.json +++ b/greenmine/base/fixtures/initial_data.json @@ -249,11 +249,6 @@ "scrum", "issue" ], - [ - "can_change_issue", - "scrum", - "issue" - ], [ "can_change_issue_state", "scrum", @@ -269,11 +264,6 @@ "scrum", "issue" ], - [ - "can_delete_issue", - "scrum", - "issue" - ], [ "can_view_issue", "scrum", @@ -339,16 +329,6 @@ "scrum", "milestone" ], - [ - "can_change_milestone", - "scrum", - "milestone" - ], - [ - "can_delete_milestone", - "scrum", - "milestone" - ], [ "can_view_milestone", "scrum", @@ -399,16 +379,6 @@ "scrum", "project" ], - [ - "can_change_project", - "scrum", - "project" - ], - [ - "can_delete_project", - "scrum", - "project" - ], [ "can_list_projects", "scrum", @@ -479,11 +449,6 @@ "scrum", "task" ], - [ - "can_change_task", - "scrum", - "task" - ], [ "can_change_task_state", "scrum", @@ -494,11 +459,6 @@ "scrum", "task" ], - [ - "can_delete_task", - "scrum", - "task" - ], [ "can_view_task", "scrum", @@ -544,11 +504,6 @@ "scrum", "userstory" ], - [ - "can_change_userstory", - "scrum", - "userstory" - ], [ "can_comment_userstory", "scrum", diff --git a/greenmine/scrum/models.py b/greenmine/scrum/models.py index f0485e52..56bc4831 100644 --- a/greenmine/scrum/models.py +++ b/greenmine/scrum/models.py @@ -141,8 +141,6 @@ class Project(models.Model): permissions = ( ('can_list_projects', 'Can list projects'), ('can_view_project', 'Can view project'), - ('can_change_project', 'Can change project'), - ('can_delete_project', 'Can delete project'), ('can_manage_users', 'Can manage users'), ) @@ -189,8 +187,6 @@ class Milestone(models.Model): permissions = ( ('can_view_milestone', 'Can view milestones'), - ('can_change_milestone', 'Can change milestones'), - ('can_delete_milestone', 'Can delete milestones'), ) def __unicode__(self): @@ -234,7 +230,6 @@ class UserStory(models.Model): ('can_comment_userstory', 'Can comment user stories'), ('can_view_userstory', 'Can view 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_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_change_task_state', 'Can change the task state'), ('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'), ) @@ -378,8 +371,6 @@ class Issue(models.Model): ('can_assign_issue_to_myself', 'Can assign issues to myself'), ('can_change_issue_state', 'Can change the issue state'), ('can_view_issue', 'Can view the issue'), - ('can_change_issue', 'Can change the issue'), - ('can_delete_issue', 'Can delete the issue'), ) def __unicode__(self): diff --git a/greenmine/scrum/permissions.py b/greenmine/scrum/permissions.py index 35f878d5..7f52e9ba 100644 --- a/greenmine/scrum/permissions.py +++ b/greenmine/scrum/permissions.py @@ -2,56 +2,56 @@ from greenmine.base.permissions import BaseDetailPermission class ProjectDetailPermission(BaseDetailPermission): get_permission = "can_view_project" - put_permission = "can_change_project" - patch_permission = "can_change_project" - delete_permission = "can_delete_project" + put_permission = "change_project" + patch_permission = "change_project" + delete_permission = "delete_project" safe_methods = ['HEAD', 'OPTIONS'] path_to_project = [] class MilestoneDetailPermission(BaseDetailPermission): get_permission = "can_view_milestone" - put_permission = "can_change_milestone" - patch_permission = "can_change_milestone" - delete_permission = "can_delete_milestone" + put_permission = "change_milestone" + patch_permission = "change_milestone" + delete_permission = "delete_milestone" safe_methods = ['HEAD', 'OPTIONS'] path_to_project = ['project'] class UserStoryDetailPermission(BaseDetailPermission): get_permission = "can_view_userstory" - put_permission = "can_change_userstory" - patch_permission = "can_change_userstory" - delete_permission = "can_delete_userstory" + put_permission = "change_userstory" + patch_permission = "change_userstory" + delete_permission = "delete_userstory" safe_methods = ['HEAD', 'OPTIONS'] path_to_project = ['project'] class TaskDetailPermission(BaseDetailPermission): get_permission = "can_view_task" - put_permission = "can_change_task" - patch_permission = "can_change_task" - delete_permission = "can_delete_task" + put_permission = "change_task" + patch_permission = "change_task" + delete_permission = "delete_task" safe_methods = ['HEAD', 'OPTIONS'] path_to_project = ['project'] class IssueDetailPermission(BaseDetailPermission): get_permission = "can_view_issue" - put_permission = "can_change_issue" - patch_permission = "can_change_issue" + put_permission = "change_issue" + patch_permission = "change_issue" delete_permission = "can_delete_issue" safe_methods = ['HEAD', 'OPTIONS'] path_to_project = ['project'] class ChangeDetailPermission(BaseDetailPermission): get_permission = "can_view_change" - put_permission = "can_change_change" - patch_permission = "can_change_change" + put_permission = "change_change" + patch_permission = "change_change" delete_permission = "can_delete_change" safe_methods = ['HEAD', 'OPTIONS'] path_to_project = ['project'] class ChangeAttachmentDetailPermission(BaseDetailPermission): get_permission = "can_view_changeattachment" - put_permission = "can_change_changeattachment" - patch_permission = "can_change_changeattachment" + put_permission = "change_changeattachment" + patch_permission = "change_changeattachment" delete_permission = "can_delete_changeattachment" safe_methods = ['HEAD', 'OPTIONS'] path_to_project = ['change', 'project'] diff --git a/greenmine/wiki/models.py b/greenmine/wiki/models.py index f09136b1..cefd5108 100644 --- a/greenmine/wiki/models.py +++ b/greenmine/wiki/models.py @@ -11,10 +11,9 @@ class WikiPage(models.Model): watchers = models.ManyToManyField('base.User', related_name='wikipage_watchers', - null=True) + null=True, blank=True) created_date = models.DateTimeField(auto_now_add=True) - tags = DictField() class Meta: permissions = ( @@ -30,4 +29,3 @@ class WikiPageAttachment(models.Model): modified_date = models.DateTimeField(auto_now_add=True) attached_file = models.FileField(upload_to="files/wiki", max_length=500, null=True, blank=True) - tags = DictField() diff --git a/greenmine/wiki/permissions.py b/greenmine/wiki/permissions.py index 2228f01c..a55be2e8 100644 --- a/greenmine/wiki/permissions.py +++ b/greenmine/wiki/permissions.py @@ -2,14 +2,16 @@ from greenmine.base.permissions import BaseDetailPermission class WikiPageDetailPermission(BaseDetailPermission): get_permission = "can_view_wikipage" - put_permission = "can_change_wikipage" + put_permission = "change_wikipage" + patch_permission = "change_wikipage" delete_permission = "can_delete_wikipage" safe_methods = ['HEAD', 'OPTIONS'] path_to_document = [] class WikiPageAttachmentDetailPermission(BaseDetailPermission): get_permission = "can_view_wikipageattachment" - put_permission = "can_change_wikipageattachment" + put_permission = "change_wikipageattachment" + patch_permission = "change_wikipageattachment" delete_permission = "can_delete_wikipageattachment" safe_methods = ['HEAD', 'OPTIONS'] path_to_document = [] diff --git a/greenmine/wiki/urls.py b/greenmine/wiki/urls.py index e4912c91..72792ff3 100644 --- a/greenmine/wiki/urls.py +++ b/greenmine/wiki/urls.py @@ -5,7 +5,7 @@ from greenmine.wiki import api urlpatterns = format_suffix_patterns(patterns('', url(r'^wiki_pages/$', api.WikiPageList.as_view(), name='wiki-page-list'), - url(r'^wiki_pages/(?P[0-9]+)/$', api.WikiPageDetail.as_view(), name='wiki-page-detail'), + url(r'^wiki_pages/(?P[\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/(?P[0-9]+)/$', api.WikiPageAttachmentDetail.as_view(), name='wiki-page-attachment-detail'), ))