Skip to content

Commit

Permalink
Update dosctring and fix yapf errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ba11b0y committed Oct 1, 2018
1 parent 768779e commit bdc332b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 22 deletions.
29 changes: 8 additions & 21 deletions readthedocs/builds/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,8 @@ class BuildBase(object):

def get_queryset(self):
self.project_slug = self.kwargs.get('project_slug', None)
self.project = get_object_or_404(
Project.objects.protected(self.request.user),
slug=self.project_slug,
)
queryset = Build.objects.public(
user=self.request.user, project=self.project
)
self.project = get_object_or_404(Project.objects.protected(self.request.user),slug=self.project_slug,)
queryset = Build.objects.public(user=self.request.user, project=self.project)

return queryset

Expand All @@ -62,26 +57,22 @@ def post(self, request, project_slug):
slug=version_slug,
)

signature = trigger_build(project=project, version=version)[1]
_, signature = trigger_build(project=project, version=version)
build_pk = signature.get('kwargs', {}).get('build_pk')
return HttpResponseRedirect(
reverse('builds_detail', args=[project.slug, build_pk])
)
reverse('builds_detail', args=[project.slug, build_pk]))


class BuildList(BuildBase, BuildTriggerMixin, ListView):

def get_context_data(self, **kwargs):
context = super(BuildList, self).get_context_data(**kwargs)

active_builds = self.get_queryset().exclude(state='finished'
).values('id')
active_builds = self.get_queryset().exclude(state='finished').values('id')

context['project'] = self.project
context['active_builds'] = active_builds
context['versions'] = Version.objects.public(
user=self.request.user, project=self.project
)
context['versions'] = Version.objects.public(user=self.request.user, project=self.project)
context['build_qs'] = self.get_queryset()

return context
Expand All @@ -100,12 +91,8 @@ def get_context_data(self, **kwargs):


def builds_redirect_list(request, project_slug): # pylint: disable=unused-argument
return HttpResponsePermanentRedirect(
reverse('builds_project_list', args=[project_slug])
)
return HttpResponsePermanentRedirect(reverse('builds_project_list', args=[project_slug]))


def builds_redirect_detail(request, project_slug, pk): # pylint: disable=unused-argument
return HttpResponsePermanentRedirect(
reverse('builds_detail', args=[project_slug, pk])
)
return HttpResponsePermanentRedirect(reverse('builds_detail', args=[project_slug, pk]))
2 changes: 1 addition & 1 deletion readthedocs/core/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def trigger_build(project, version=None, record=True, force=False):
:param version: version of the project to be built. Default: ``latest``
:param record: whether or not record the build in a new Build object
:param force: build the HTML documentation even if the files haven't changed
:returns: Celery AsyncResult promise
:returns: A tuple (Celery AsyncResult promise, Task Signature from ``prepare_build``)
"""
update_docs_task = prepare_build(
project,
Expand Down

0 comments on commit bdc332b

Please sign in to comment.