Skip to content
This repository was archived by the owner on Oct 5, 2023. It is now read-only.

[MCKIN-7023] Ensures that default template tags are loaded for Django 1.11#49

Merged
macdiesel merged 1 commit intoopenedx-unsupported:masterfrom
open-craft:MCKIN-7023-template-l10n
May 10, 2018
Merged

[MCKIN-7023] Ensures that default template tags are loaded for Django 1.11#49
macdiesel merged 1 commit intoopenedx-unsupported:masterfrom
open-craft:MCKIN-7023-template-l10n

Conversation

@pomegranited
Copy link
Contributor

Fixes bug related to the Django 1.11 upgrade and support for translations in XBlock templates added by #48.

Ensures that the standard Django templatetag libraries continue to work in XBlock templates (e.g., DnDv2 uses l10n).

JIRA tickets: MCKIN-7023, OSPR

Discussions: WL-230, YONK-879

Screenshots:

Before
Before this fix and since edx-platform was upgraded to Django 1.11, attempts to edit the DnDv2 XBlock in Studio resulted in this error:
before

After this change, DnDv2 XBlock can be edited as expected:
after

Sandbox URL: (provisioning)

Merge deadline: ASAP

Testing instructions:

  1. In Studio, create a course and add a Drag and Drop problem (e.g. sandbox Drag and Drop)
  2. Edit the DnDv2 XBlock.
    Note that this works as expected.

Reviewers

  • @mtyaka
  • edx-solutions reviewer[s] TBD

CC @macdiesel

@openedx-webhooks openedx-webhooks added needs triage open-source-contribution PR author is not from Axim or 2U labels May 9, 2018
@mtyaka
Copy link
Contributor

mtyaka commented May 9, 2018

Thanks for catching and fixing this @pomegranited!

👍

  • I tested this: Verified that with this patch installed editing the problem in the studio works as expected.
  • I read through the code
  • I checked for accessibility issues
  • Includes documentation n/a

@pomegranited
Copy link
Contributor Author

@mduboseedx FYI, this is ready for review. It's blocking openedx/xblock-drag-and-drop-v2#154 and https://github.com/edx/edx-platform/pull/17670, so we'd really appreciate it if you could help us get it merged.

@mduboseedx mduboseedx removed needs triage open-source-contribution PR author is not from Axim or 2U labels May 9, 2018
@mduboseedx
Copy link

@pomegranited This actually should not have opened an OSPR (something to figure out with our bot), but I'll check in with Brian to hopefully get this reviewed.

@macdiesel Could this be looked at soon? It is blocking two other McKinsey PRs.

@pomegranited
Copy link
Contributor Author

Thank you for your help @mduboseedx !

@macdiesel macdiesel merged commit 18fcd70 into openedx-unsupported:master May 10, 2018
@macdiesel
Copy link
Contributor

Thank you for this PR!

@pomegranited pomegranited deleted the MCKIN-7023-template-l10n branch May 10, 2018 22:30
@pomegranited
Copy link
Contributor Author

pomegranited commented May 10, 2018

@macdiesel Thank you for getting on this so quickly!

Pushed tag v1.1.1.

@openedx-webhooks
Copy link

Although this pull request is already merged, I've created OSPR-5499 so that we can track it in Jira.

There is nothing you have to do. No action is needed from your side. Thanks again for your contribution.

@openedx-webhooks openedx-webhooks added merged open-source-contribution PR author is not from Axim or 2U and removed open-source-contribution PR author is not from Axim or 2U labels Jan 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

merged open-source-contribution PR author is not from Axim or 2U

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants