Branch: refs/heads/master
  Home:   https://github.com/django/django
  Commit: e1643e3535c4160c1a56c80f4d4db9848dc65e7a
      
https://github.com/django/django/commit/e1643e3535c4160c1a56c80f4d4db9848dc65e7a
  Author: Florian Apolloner <flor...@apolloner.eu>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M django/contrib/admin/templates/admin/change_form.html
    M tests/regressiontests/admin_views/fixtures/string-primary-key.xml
    M tests/regressiontests/admin_views/models.py
    M tests/regressiontests/admin_views/tests.py

  Log Message:
  -----------
  Don't escape object ids when passing to the contenttypes.shortcut view.

This commit also changes the string pk to string_pk instead of id, to test
if the admin uses .pk throughout the codebase.


  Commit: 23d230f05833a63e951b8f451ff6c9f570eb3208
      
https://github.com/django/django/commit/23d230f05833a63e951b8f451ff6c9f570eb3208
  Author: Aymeric Augustin <aymeric.augus...@m4x.org>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M django/contrib/admin/templates/admin/change_form.html
    M tests/regressiontests/admin_views/fixtures/string-primary-key.xml
    M tests/regressiontests/admin_views/models.py
    M tests/regressiontests/admin_views/tests.py

  Log Message:
  -----------
  Merge pull request #123 from apollo13/ticket18381

Fixed #18381 -- Stopped escaping object ids

when passing them to the contenttypes.shortcut view.

Thanks apollo13 for the patch and dhepper for the review.


Compare: https://github.com/django/django/compare/c172951...23d230f

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to