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

Merge branch 'master' into permissions

remotes/origin/enhancement/email-actions
Jesús Espino 2013-03-30 20:24:27 +01:00
parent 3fc0a9de67 aa13e95c28
commit c2654c010b
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
greenmine/base/middleware.py
View File

@ -54,7 +54,7 @@ class GreenmineSessionMiddleware(object):
COORS_ALLOWED_ORIGINS = getattr(settings, 'COORS_ALLOWED_ORIGINS', '*') COORS_ALLOWED_ORIGINS = getattr(settings, 'COORS_ALLOWED_ORIGINS', '*')
COORS_ALLOWED_METHODS = getattr(settings, 'COORS_ALLOWED_METHODS', COORS_ALLOWED_METHODS = getattr(settings, 'COORS_ALLOWED_METHODS',
['POST', 'GET', 'OPTIONS', 'PUT', 'DELETE']) ['POST', 'GET', 'OPTIONS', 'PUT', 'DELETE', 'PATCH'])
COORS_ALLOWED_HEADERS = getattr(settings, 'COORS_ALLOWED_HEADERS', COORS_ALLOWED_HEADERS = getattr(settings, 'COORS_ALLOWED_HEADERS',
['Content-Type', 'X-Requested-With', ['Content-Type', 'X-Requested-With',
'X-Session-Token', 'Accept-Encoding']) 'X-Session-Token', 'Accept-Encoding'])

2
greenmine/scrum/admin.py
View File

@ -45,7 +45,7 @@ admin.site.register(models.Milestone, MilestoneAdmin)
class UserStoryAdmin(reversion.VersionAdmin): class UserStoryAdmin(reversion.VersionAdmin):
list_display = ["ref", "milestone", "project", "owner"] list_display = ["ref", "milestone", "project", "owner", 'status', 'is_closed']
admin.site.register(models.UserStory, UserStoryAdmin) admin.site.register(models.UserStory, UserStoryAdmin)

4
greenmine/scrum/api.py
View File

@ -46,7 +46,7 @@ class ProjectDetail(generics.RetrieveUpdateDestroyAPIView):
permission_classes = (ProjectDetailPermission,) permission_classes = (ProjectDetailPermission,)
class MilestoneList(SimpleFilterMixin, generics.ListCreateAPIView): class MilestoneList(generics.ListCreateAPIView):
model = Milestone model = Milestone
serializer_class = MilestoneSerializer serializer_class = MilestoneSerializer
filter_fields = ('project',) filter_fields = ('project',)
@ -61,7 +61,7 @@ class MilestoneDetail(generics.RetrieveUpdateDestroyAPIView):
permission_classes = (MilestoneDetailPermission,) permission_classes = (MilestoneDetailPermission,)
class UserStoryList(SimpleFilterMixin, generics.ListCreateAPIView): class UserStoryList(generics.ListCreateAPIView):
model = UserStory model = UserStory
serializer_class = UserStorySerializer serializer_class = UserStorySerializer
filter_fields = ('project', 'milestone') filter_fields = ('project', 'milestone')

6
greenmine/scrum/models.py
View File

@ -247,8 +247,12 @@ class UserStory(models.Model):
def __unicode__(self): def __unicode__(self):
return u"{0} ({1})".format(self.subject, self.ref) return u"{0} ({1})".format(self.subject, self.ref)
@property
def is_closed(self):
return self.status.is_closed
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.ref and self.project: if self.ref is None and self.project:
self.ref = ref_uniquely(self.project, "last_us_ref", self.__class__) self.ref = ref_uniquely(self.project, "last_us_ref", self.__class__)
super(UserStory, self).save(*args, **kwargs) super(UserStory, self).save(*args, **kwargs)

3
greenmine/scrum/serializers.py
View File

@ -13,7 +13,7 @@ class PickleField(serializers.WritableField):
return obj return obj
def from_native(self, data): def from_native(self, data):
return json.loads(data) return data
class ProjectSerializer(serializers.ModelSerializer): class ProjectSerializer(serializers.ModelSerializer):
@ -26,6 +26,7 @@ class ProjectSerializer(serializers.ModelSerializer):
class UserStorySerializer(serializers.ModelSerializer): class UserStorySerializer(serializers.ModelSerializer):
tags = PickleField() tags = PickleField()
is_closed = serializers.BooleanField()
class Meta: class Meta:
model = UserStory model = UserStory