Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Django 1.11 #970

Merged
merged 2 commits into from
Jan 18, 2018
Merged

Django 1.11 #970

merged 2 commits into from
Jan 18, 2018

Conversation

cadecairos
Copy link

  1. Use the lastest master branch commit of Mezzanine (Django 1.11 support)
  2. Update Django to 1.11
  3. Fix custom adminsortable template tags that were passing Context into the render method
  4. Remove deprecated Middleware

…port)

2. Update Django to 1.11
3. Fix custom adminsortable template tags that were passing Context into the render method
4. Remove deprecated Middleware
@cadecairos cadecairos temporarily deployed to foundation-mofostaging--pr-970 January 18, 2018 18:28 Inactive
Copy link
Contributor

@gideonthomas gideonthomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one question otherwise lgtm

@@ -44,10 +51,13 @@ def render_object_rep(
obj,
forloop
):
context.update({'object': obj, 'forloop': forloop})
tmpl = template.loader.get_template(
'{app_name}/adminsortable_objects_custom.html'.format(
app_name=context.get('opts').app_label
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is still working?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The trick was to pass opts along from context in every level of the template render, since it only accepts a plain dict.

@coveralls
Copy link

Coverage Status

Coverage increased (+3.9%) to 82.798% when pulling ddf7c8f on django-1.11 into 7786116 on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+4.05%) to 82.902% when pulling ddf7c8f on django-1.11 into 7786116 on master.

@cadecairos cadecairos merged commit de4969e into master Jan 18, 2018
@cadecairos cadecairos deleted the django-1.11 branch January 18, 2018 18:38
cadecairos pushed a commit that referenced this pull request Jan 18, 2018
This reverts commit de4969e.
@cadecairos cadecairos mentioned this pull request Jan 18, 2018
cadecairos pushed a commit that referenced this pull request Jan 18, 2018
@cadecairos cadecairos restored the django-1.11 branch January 18, 2018 19:47
@cadecairos cadecairos mentioned this pull request Jan 18, 2018
alanmoo added a commit that referenced this pull request Jan 19, 2018
* master:
  Django 1.11 (#976)
  Add years to the front of the newsByYear array as we iterate, rather than to the back [Fixes #972] (#975)
  Revert "Django 1.11 (#970)" (#973)
  Django 1.11 (#970)
  Create fake data for testing (#932)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants