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

Removing things from the votes __init__ file

remotes/origin/enhancement/email-actions
Jesús Espino 2014-06-05 17:51:52 +02:00
parent 813239c601
commit c9706122a2
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
taiga/projects/api.py
View File

@ -40,7 +40,9 @@ from . import serializers
from . import models from . import models
from . import permissions from . import permissions
from . import services from . import services
from . import votes from .votes.utils import attach_votescount_to_queryset
from .votes import services as votes_service
from .votes import serializers as votes_serializers
class ProjectAdminViewSet(ModelCrudViewSet): class ProjectAdminViewSet(ModelCrudViewSet):
@ -50,7 +52,7 @@ class ProjectAdminViewSet(ModelCrudViewSet):
def get_queryset(self): def get_queryset(self):
qs = models.Project.objects.all() qs = models.Project.objects.all()
qs = votes.attach_votescount_to_queryset(qs, as_field="stars_count") qs = attach_votescount_to_queryset(qs, as_field="stars_count")
return qs return qs
def pre_save(self, obj): def pre_save(self, obj):
@ -71,7 +73,7 @@ class ProjectViewSet(ModelCrudViewSet):
def get_queryset(self): def get_queryset(self):
qs = models.Project.objects.all() qs = models.Project.objects.all()
qs = votes.attach_votescount_to_queryset(qs, as_field="stars_count") qs = attach_votescount_to_queryset(qs, as_field="stars_count")
qs = qs.filter(Q(owner=self.request.user) | qs = qs.filter(Q(owner=self.request.user) |
Q(members=self.request.user)) Q(members=self.request.user))
return qs.distinct() return qs.distinct()
@ -84,13 +86,13 @@ class ProjectViewSet(ModelCrudViewSet):
@detail_route(methods=['post'], permission_classes=(IsAuthenticated,)) @detail_route(methods=['post'], permission_classes=(IsAuthenticated,))
def star(self, request, pk=None): def star(self, request, pk=None):
project = self.get_object() project = self.get_object()
votes.add_vote(project, user=request.user) votes_service.add_vote(project, user=request.user)
return Response(status=status.HTTP_200_OK) return Response(status=status.HTTP_200_OK)
@detail_route(methods=['post'], permission_classes=(IsAuthenticated,)) @detail_route(methods=['post'], permission_classes=(IsAuthenticated,))
def unstar(self, request, pk=None): def unstar(self, request, pk=None):
project = self.get_object() project = self.get_object()
votes.remove_vote(project, user=request.user) votes_service.remove_vote(project, user=request.user)
return Response(status=status.HTTP_200_OK) return Response(status=status.HTTP_200_OK)
@detail_route(methods=['get']) @detail_route(methods=['get'])
@ -328,13 +330,13 @@ class ProjectTemplateViewSet(ModelCrudViewSet):
class FansViewSet(ModelCrudViewSet): class FansViewSet(ModelCrudViewSet):
serializer_class = votes.serializers.VoterSerializer serializer_class = votes_serializers.VoterSerializer
list_serializer_class = votes.serializers.VoterSerializer list_serializer_class = votes_serializers.VoterSerializer
permission_classes = (IsAuthenticated,) permission_classes = (IsAuthenticated,)
def get_queryset(self): def get_queryset(self):
project = models.Project.objects.get(pk=self.kwargs.get("project_id")) project = models.Project.objects.get(pk=self.kwargs.get("project_id"))
return votes.get_voters(project) return votes_service.get_voters(project)
class StarredViewSet(ModelCrudViewSet): class StarredViewSet(ModelCrudViewSet):
@ -343,4 +345,4 @@ class StarredViewSet(ModelCrudViewSet):
permission_classes = (IsAuthenticated,) permission_classes = (IsAuthenticated,)
def get_queryset(self): def get_queryset(self):
return votes.get_voted(self.kwargs.get("user_id"), model=models.Project) return votes_service.get_voted(self.kwargs.get("user_id"), model=models.Project)

16
taiga/projects/issues/api.py
View File

@ -29,7 +29,9 @@ from taiga.base.api import ModelCrudViewSet
from taiga.projects.mixins.notifications import NotificationSenderMixin from taiga.projects.mixins.notifications import NotificationSenderMixin
from .. import votes from taiga.projects.votes.utils import attach_votescount_to_queryset
from taiga.projects.votes import services as votes_service
from taiga.projects.votes import serializers as votes_serializers
from . import models from . import models
from . import permissions from . import permissions
from . import serializers from . import serializers
@ -116,7 +118,7 @@ class IssueViewSet(NotificationSenderMixin, ModelCrudViewSet):
def get_queryset(self): def get_queryset(self):
qs = self.model.objects.all() qs = self.model.objects.all()
qs = votes.attach_votescount_to_queryset(qs, as_field="votes_count") qs = attach_votescount_to_queryset(qs, as_field="votes_count")
return qs return qs
def pre_save(self, obj): def pre_save(self, obj):
@ -149,21 +151,21 @@ class IssueViewSet(NotificationSenderMixin, ModelCrudViewSet):
@detail_route(methods=['post'], permission_classes=(IsAuthenticated,)) @detail_route(methods=['post'], permission_classes=(IsAuthenticated,))
def upvote(self, request, pk=None): def upvote(self, request, pk=None):
issue = self.get_object() issue = self.get_object()
votes.add_vote(issue, user=request.user) votes_service.add_vote(issue, user=request.user)
return Response(status=status.HTTP_200_OK) return Response(status=status.HTTP_200_OK)
@detail_route(methods=['post'], permission_classes=(IsAuthenticated,)) @detail_route(methods=['post'], permission_classes=(IsAuthenticated,))
def downvote(self, request, pk=None): def downvote(self, request, pk=None):
issue = self.get_object() issue = self.get_object()
votes.remove_vote(issue, user=request.user) votes_service.remove_vote(issue, user=request.user)
return Response(status=status.HTTP_200_OK) return Response(status=status.HTTP_200_OK)
class VotersViewSet(ModelCrudViewSet): class VotersViewSet(ModelCrudViewSet):
serializer_class = votes.serializers.VoterSerializer serializer_class = votes_serializers.VoterSerializer
list_serializer_class = votes.serializers.VoterSerializer list_serializer_class = votes_serializers.VoterSerializer
permission_classes = (IsAuthenticated,) permission_classes = (IsAuthenticated,)
def get_queryset(self): def get_queryset(self):
issue = models.Issue.objects.get(pk=self.kwargs.get("issue_id")) issue = models.Issue.objects.get(pk=self.kwargs.get("issue_id"))
return votes.get_voters(issue) return votes_service.get_voters(issue)

7
taiga/projects/votes/__init__.py
View File

@ -1,7 +0,0 @@
from .services import add_vote
from .services import remove_vote
from .services import get_voters
from .services import get_votes
from .services import get_voted
from .utils import attach_votescount_to_queryset
from . import serializers