From c54e800ba263cca547f66baea0f09c7daef288d4 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 5 Feb 2019 13:01:07 -0500 Subject: [PATCH 1/3] Allow to override trigger_build from demo project This is to fix a case in the corporate site --- readthedocs/projects/views/private.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/readthedocs/projects/views/private.py b/readthedocs/projects/views/private.py index c27dc0e9fc6..224919c0953 100644 --- a/readthedocs/projects/views/private.py +++ b/readthedocs/projects/views/private.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - """Project views for authenticated users.""" import logging @@ -58,9 +56,9 @@ ProjectRelationship, WebHook, ) +from readthedocs.projects.notifications import EmailConfirmNotification from readthedocs.projects.signals import project_import from readthedocs.projects.views.base import ProjectAdminMixin, ProjectSpamMixin -from readthedocs.projects.notifications import EmailConfirmNotification from ..tasks import retry_domain_verification @@ -354,7 +352,7 @@ def get(self, request, *args, **kwargs): if form.is_valid(): project = form.save() project.save() - trigger_build(project) + self.trigger_build(project) messages.success( request, _('Your demo project is currently being imported'), @@ -381,6 +379,9 @@ def get_form_kwargs(self): """Form kwargs passed in during instantiation.""" return {'user': self.request.user} + def trigger_build(self, project): + return trigger_build(project) + class ImportView(PrivateViewMixin, TemplateView): From 1ffd4260bb664a7412e66e2bfbbfb391653b6261 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 5 Feb 2019 17:13:25 -0500 Subject: [PATCH 2/3] Rename method --- readthedocs/projects/views/private.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readthedocs/projects/views/private.py b/readthedocs/projects/views/private.py index 224919c0953..c4a439690ae 100644 --- a/readthedocs/projects/views/private.py +++ b/readthedocs/projects/views/private.py @@ -352,7 +352,7 @@ def get(self, request, *args, **kwargs): if form.is_valid(): project = form.save() project.save() - self.trigger_build(project) + self.trigger_initial_build(project) messages.success( request, _('Your demo project is currently being imported'), @@ -379,7 +379,7 @@ def get_form_kwargs(self): """Form kwargs passed in during instantiation.""" return {'user': self.request.user} - def trigger_build(self, project): + def trigger_initial_build(self, project): return trigger_build(project) From 21371da2144bd2b9cd7205db077c4e8a29f28dc3 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Wed, 6 Feb 2019 10:59:17 -0500 Subject: [PATCH 3/3] Docstring --- readthedocs/projects/views/private.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/readthedocs/projects/views/private.py b/readthedocs/projects/views/private.py index c4a439690ae..04d6d681b11 100644 --- a/readthedocs/projects/views/private.py +++ b/readthedocs/projects/views/private.py @@ -380,6 +380,11 @@ def get_form_kwargs(self): return {'user': self.request.user} def trigger_initial_build(self, project): + """ + Trigger initial build. + + Allow to override the behavior from outside. + """ return trigger_build(project)