Including #10623 into WL-245 #11224
Including #10623 into WL-245 #11224
Conversation
|
Thanks for the pull request, @felipemontoya! I've created OSPR-1073 to keep track of it in JIRA. JIRA is a place for product owners to prioritize feature reviews by the engineering development teams. Feel free to add as much of the following information to the ticket:
All technical communication about the code itself will still be done via the GitHub pull request interface. As a reminder, our process documentation is here. |
|
@mattdrayer and @ziafazal These are the changes I mentioned in #11073. And this PR is a created against the intermediate branch. Feel free to merge it or cherry pick the commits |
|
@felipemontoya if we merge this into #11073 should we close #10623? |
|
@mattdrayer, no #10623 is already merged. If you merge this, then #11073 will not break the functionality of #10623 |
|
ah, of course, sorry, juggling too many PRs :) On Wed, Jan 13, 2016 at 9:28 PM, Felipe Montoya notifications@github.com
Matthew Drayer |
| @@ -41,6 +41,8 @@ def run(): | |||
|
|
|||
| add_mimetypes() | |||
|
|
|||
| microsite.enable_microsites(log) | |||
There was a problem hiding this comment.
@felipemontoya I'm not able to understand the usage of this statement. Why we need to do the same thing once before django.setup() and once afterwards? Could you please explain a little?
There was a problem hiding this comment.
Sure. It goes like this, we are doing similar things, but for different components.
We currently use 2 template rendering engines, mako and django_templates, and one of them (django templates), requires the directories be added before the django.setup(). Mako requires the directories to be added after the django setup. That is why we have this that modified the DIRS for the django_templates setup before the django.setup() and we also have this which does the same for mako after the django.setup(). I did left this line even when it was not necessary, just to be sure, but we can remove it and nothing should be affected.
There was a problem hiding this comment.
@ziafazal I tried it locally and also removed the duplicated line
There was a problem hiding this comment.
@felipemontoya it would be nice if you can post these comments inside code.
|
jenkins run python |
|
jenkins run lettuce |
|
@felipemontoya -- running into some test failures on this branch -- can you take a look when you have a moment? |
|
darn, (unrelated) test timeout jenkins run bokchoy |
|
@felipemontoya this changeset now LGTM -- 👍! We can squash the commits and merge once @ziafazal approves. |
|
LGTM 👍 |
This PR updates the code in the microsite_configuration djangoapp to match the recent changes in PR #10623