Commit Graph

3706 Commits

Author SHA1 Message Date
Julien Phalip 3ad34c231b [1.5.x] Fixed #19505 -- A more flexible implementation for customizable admin redirect urls.
Work by Julien Phalip.

Refs #8001, #18310, #19505. See also 0b908b92a2.

35d1cd0b28 from master.
2012-12-24 18:12:13 -03:00
Aymeric Augustin cd914175c8 [1.5.x] Prevented caching of streaming responses.
The test introduced in 4b278131 accidentally passed because of a
limitation of Python < 3.3.

Refs #17758, #7581.

Backport of 1c8be95 from master.
2012-12-24 20:30:20 +01:00
Aymeric Augustin 1114d8203e [1.5.x] Fixed a randomly failing test under Python 3.
Refs #17758.

Backport of e8f07f0 from master.
2012-12-24 11:26:38 +01:00
Luke Plant 00aea69f06 [1.5.x] Fixed a dependence on set-ordering in tests
Backport of 1ae64e96c1 from master
2012-12-24 02:21:19 +00:00
Luke Plant b362a55969 [1.5.x] Made admin generated changelist URLs independent of dict ordering
Backport of c31c2c92b8 from master
2012-12-24 02:20:32 +00:00
Ian Clelland cade3405c0 [1.5.x] Don't rely on dictionary ordering in tests
Backport of b9fc70141a from master
2012-12-24 02:19:53 +00:00
Ian Clelland 95b4f34b5e [1.5.x] Use HTML parser to compare html snippets
Backport of 585aa11d23 from master
2012-12-24 02:19:31 +00:00
Ian Clelland 515cf94b60 [1.5.x] Use new TestCase methods for equality comparisons
Backport of 8d35fd4c32 from master
2012-12-24 02:19:16 +00:00
Aymeric Augustin 9919638137 [1.5.x] Fixed #19468 -- Decoded request.path correctly on Python 3.
Thanks aliva for the report and claudep for the feedback.

Backport of 1e4a27d from master.
2012-12-22 14:45:06 +01:00
Russell Keith-Magee b7607003a5 [1.5.x] Fixed #19401 -- Ensure that swappable model references are case insensitive.
This is necessary because get_model() checks are case insensitive, and if the swapable check isn't, the
swappable logic gets tied up in knots with models that are partially swapped out.

Thanks to chris@cogdon.org for the report and extensive analysis, and Preston for his work on the draft patch.

Backport of c04c03d from trunk.
2012-12-20 16:14:10 +08:00
Patryk Zawadzki 9892919b0d [1.5.x] Fixed #18172 -- Made models with __iter__ usable in ModelMultipleChoiceField
Thanks to Patryk Zawadzki for the patch.

Backpatch of 3989ce52ef
2012-12-19 22:56:19 +02:00
Claude Paroz ddea0e0d7e [1.5.x] Fixed #19441 -- Created PostgreSQL varchar index when unique=True
Thanks Dylan Verheul for the report and Anssi Kääriäinen for the
review.
Backport of 55972ee5c from master.
2012-12-18 10:04:47 +01:00
Claude Paroz 0bbc7c2b49 [1.5.x] Fixed #19483 -- Improved import error message in contrib.comments
Thanks Valentin Lorentz for the report and the suggested fix.
Backport of ed711c4bd from master.
2012-12-16 21:13:30 +01:00
Russell Keith-Magee 06b5f5fcb6 [1.5.X] Corrected tests depending on the error message on the AuthenticationForm.
Refs #19368, and the fix introduced in 27f8129d64.

Backport of 9facca28b6 from trunk.
2012-12-16 07:22:25 +08:00
Claude Paroz c20c3a20a3 [1.5.x] Fixed #19432 -- Provided better error message for get_object_or_404
Thanks Kit Sunde for the report and Brian Holdefehr for the initial
patch.
Backport of 6ed6a18a0 from master.
2012-12-12 22:05:49 +01:00
Florian Apolloner deb205b8ce [1.5.X] Fixed an order dependant test failure.
Backport of 7e97f4f510 from master.
2012-12-11 16:26:53 +01:00
Florian Apolloner 919fbe08c9 [1.5.X] Fixed a test failure in the comment tests.
Backport of 1eb0da1c5b from master.
2012-12-10 23:36:17 +01:00
Florian Apolloner 77b06e4151 [1.5.X] Fixed a security issue in get_host.
Full disclosure and new release forthcoming.
2012-12-10 22:13:28 +01:00
Florian Apolloner fce1fa0f7f [1.5.X] Fixed #18856 -- Ensured that redirects can't be poisoned by malicious users. 2012-12-10 22:13:28 +01:00
Claude Paroz 984cf8417b [1.5.x] Amended an SQL test fixture to not include an id value
Some backends might need special handling for auto-increment values.
This was introduced in 5fa5621f57. Thanks Michael Manfre for spotting
the issue.
Backport of 0cdfa76e68 from master.
2012-12-10 17:50:37 +01:00
Aymeric Augustin d6bad2e9ea [1.5.x] Fixed #19392 -- Improved error for old-style url tags with dashes.
Thanks dloewenherz for the report.

Backport of 4951932 from master.
2012-12-09 16:18:52 +01:00
Claude Paroz fce779475e [1.5.x] Removed US localflavor-specific tests from core
Also fixes #9045.
Backport of 8248d1402 from master.
2012-12-08 21:08:37 +01:00
Claude Paroz fa54604606 [1.5.x] Fixed #19423 -- Prevented ModelAdmin sharing widgets due to formfield_overrides
Thanks joebuyer at manycycles.com for the report and Simon Charette
for the review.
Backport of 04e6542b5 from master.
2012-12-08 12:47:33 +01:00
Claude Paroz 4214a22e06 [1.5.x] Fixed #19357 -- Allow non-ASCII chars in filesystem paths
Thanks kujiu for the report and Aymeric Augustin for the review.
Backport of c91667338 from master.
2012-12-08 11:16:03 +01:00
Andreas Hug 67bddc0b7b [1.5.x] Fixed #18574 -- Make BaseFormSet.is_valid call its underlying forms' is_valid
Thanks Simon Charette for the report and the initial patch.
Backport of 66dfcc10b from master.
2012-12-06 20:05:16 +01:00
Claude Paroz e9301ae451 [1.5.x] Fixed #19367 -- Fixed saving ContentFile in filesystem storage
This was not working properly when ContentFile was initialized with
an unicode string.
Thanks Alexey Boriskin for the report and the test.

Backport of 34dcf51e06 from master.
2012-12-06 17:19:35 +01:00
Marc Aymerich 57a41d985a [1.5.x] Fixed #19429 -- Applied linebreaksbr to read-only fields in inlines
Applied to inlines what ec9d6b1122 did for main fieldsets.
Backport of 553838a28 from master.
2012-12-06 09:54:47 +01:00
Ramiro Morales 6a098aa6f2 [1.5.x] Fixed #18697 -- Made values accepted for two customizable admin templates consistent.
Thanks and at cloverfastfood dot com for the report.

b64d30405a from master.
2012-12-04 19:53:52 -03:00
Anssi Kääriäinen 8c099ec3ec [1.5.x] Fixed #19391 -- Oracle specific failure in tests
The failure was caused by using None as a choice for a CharField. To
avoid Oracle's "" <-> NULL handling the field type was changed to
IntegerField.

Backpatch of 632cf32b43
2012-12-04 23:00:17 +02:00
Julien Phalip db455d6ff9 [1.5.x] Fixed the admin_filters tests for Postgres.
Backport of c196e01100
2012-12-04 10:39:49 -08:00
Claude Paroz 7fea7cf5d7 [1.5.x] Fixed #19378 -- Ensured get_success_url returns a non-lazy URL
Backport of 795ac7deda from master.
2012-12-04 13:24:04 +01:00
Sebastián Magrí 237a404d3e [1.5.x] Fixed #19318 -- Ensured that the admin's SimpleListFilter options can be displayed as selected even if the lookup's first element is not a string.
Backport of 88e1715639
2012-12-03 11:55:33 -08:00
Claude Paroz 3d62eaea69 [1.5.x] Fixed #19416 -- Fixed multi-line commands in initial SQL files
Thanks Aymeric Augustin for detecting this regression.
Backport of 5fa5621f5 from master.
2012-12-03 20:49:28 +01:00
Aymeric Augustin c9a47fb379 [1.5.x] Fixed #19397 -- Crash on binary files in project templates.
Thanks gw 2012 at tnode com for the report.

Backport of baae4b8.
2012-12-03 10:45:42 +01:00
Claude Paroz 1b93499849 [1.5.x] Fixed #19015 -- Add ISO input formats to all formats
Backport of 349c4c37f8 from master.
2012-12-01 15:43:38 +01:00
Claude Paroz 47c5b50d34 [1.5.x] Fixed #19354 -- Do not assume usermodel.pk == usermodel.id
Thanks markteisman at hotmail.com for the report.
Backport of 0eeae1505 from master.
2012-11-29 21:52:22 +01:00
Anssi Kääriäinen 957de74ebe [1.5.x] Converted a couple of assertEquals -> assertEqual 2012-11-28 23:55:47 +02:00
Tai Lee a21e8dee76 [1.5.x] Fixed #14694 -- Made ``defer()`` work with reverse relations
Reverse o2o fields are now usable with defer.

Backpatch of [6ebf115206]
2012-11-28 18:25:34 +02:00
Danilo Bargen 5509eb8626 [1.5.x] Fixed #19370 -- Made date filter properly handle midnight value
Backport of c10aaa70a from master.
2012-11-27 21:25:21 +01:00
Aymeric Augustin 71e5ad248e [1.5.x] Fixed #19362 -- Detected invalid use of @python_2_unicode_compatible.
Thanks m3wolf for the report and akaariai for reproducing the problem.

Backport of 2ea80b9.
2012-11-27 09:55:26 +01:00
Edward Tjörnhammar 7c91b67cfa [1.5.x] Fixed #17911 -- Ensure that admin readonly fields' display values are shown in change forms when the raw value is None.
Backport of 29d59a879e
2012-11-25 23:16:44 +01:00
Julien Phalip 22ca5bab95 [1.5.x] Fixed #17646 -- Added a get_list_filter() method to ModelAdmin. Thanks to rasca for the suggestion and to mateusgondim for the patch.
Backport of ae206d78f6
2012-11-25 20:43:18 +01:00
Claude Paroz 02ab5d180e [1.5.x] Fixed test failure following capitalization fix in 2f035a972
Backport of f26b956e80 from master.
2012-11-25 19:55:23 +01:00
Aymeric Augustin 37c54c27bd [1.5.x] Change exception type to reduce confusion.
TemplateSyntaxError is expected at compile time, not at run time.

Refs #19280.

Backport of 7644800.
2012-11-25 19:53:50 +01:00
Aymeric Augustin 72231610b3 [1.5.x] Fixed two typos.
Backport of f89901d from master.
2012-11-25 19:32:25 +01:00
Claude Paroz 6945f60c2b [1.5.x] Enabled SimpleTestCase to be decorated by override_settings
Refs #18417. Also fixed some test case classes which subclassed
the wrong parent.
Backport of a5d47415f from master.
2012-11-25 19:08:51 +01:00
Claude Paroz 4389b51fab [1.5.x] Fixed #18417 -- Raised exception when unittest.TestCase is decorated with override_settings
Backport of 9f7cefd5 from master.
2012-11-25 19:08:27 +01:00
Aymeric Augustin 8c2f36260e [1.5.x] Fixed #19280 -- Raised an explicit exception for the old {% url %} syntax.
Backport of 6b8a7ce.
2012-11-24 22:05:41 +01:00
Aymeric Augustin f1afd57a32 [1.5.x] Used a django.test.TestCase for compatibility with @override_settings.
These tests were silently skipped.

Backport of 95edeab.
2012-11-24 22:05:25 +01:00
Anssi Kääriäinen 0d3ec8d0fb [1.5.x] Fixed ordering-related failure in m2m_through_regress tests
Backpatch of dc569c8801
2012-11-24 16:05:30 +02:00
Chris Khoo 9efe1a7210 [1.5.x] Fixed #19237 -- Improved strip_tags utility
The previous pattern didn't properly addressed cases where '>'
was present inside quoted tag content.
Backport of bf1871d87 from master.
2012-11-24 12:20:41 +01:00
Russell Keith-Magee 2ecf3a9344 [1.5.x] Simplified the deletions performed by the swappable_models test.
This is required to allow the test to run without error under SQLite in the CI environment.

Backport of 18d7c1e.
2012-11-24 15:08:28 +08:00
Russell Keith-Magee 3fd8458fb3 [1.5.x] Fixed #19806 -- Ensure that content types and permissions aren't created for swapped models.
Thanks to rizumu for the report.

Backport of c8985a8a73.
2012-11-24 14:26:50 +08:00
Anssi Kääriäinen 421e599ad3 [1.5.x] Fixed #19351 -- SQLite bulk_insert of more than 500 single-field objs
Backpatch of 0a0a0d66b3
2012-11-24 01:20:22 +02:00
Anssi Kääriäinen 625dc3f072 [1.5.x] Fixed SQLite's collapsing of same-valued instances in bulk_create
SQLite used INSERT INTO tbl SELECT %s UNION SELECT %s, the problem
was that there should have been UNION ALL instead of UNION.

Refs #19351

Backpatch of a27582484c
2012-11-24 01:19:17 +02:00
Anssi Kääriäinen 90c7aa0740 [1.5.x] Fixed #18375 -- Removed dict-ordering dependency for F-expressions
F() expressions reuse joins like any lookup in a .filter() call -
reuse multijoins generated in the same .filter() call else generate
new joins. Also, lookups can now reuse joins generated by F().

This change is backwards incompatible, but it is required to prevent
dict randomization from generating different queries depending on
.filter() kwarg ordering. The new way is also more consistent in how
joins are reused.

Backpatch of 90b86291d0
2012-11-23 20:07:50 +02:00
Aymeric Augustin a892cd3191 [1.5.x] Tweak a test to avoid hitting a limit with SQLite.
Django cannot delete more than 999 objects at a time with SQLite.

Refs #16426, #16039.

Backport of 2875b5d from master.
2012-11-23 10:19:09 +01:00
Tim Graham 42fa51c002 [1.5.X] Fixed #18974 - Warned against using models.permalink
Thanks dstufft for the draft patch.

Backport of 0e3690d230 from master
2012-11-22 16:10:42 -05:00
Aymeric Augustin 9bd67f056c [1.5.x] Fixed #16039 -- Made post_syncdb handlers multi-db aware.
Also reverted 8fb7a90026. Refs #17055.

Backport of a026e48 from master.
2012-11-22 20:54:20 +01:00
George Hickman 12cf9d2be3 [1.5.x] Fixed #19316 -- Set View args/kwargs/request before dispatch
Backport of ea6b95db from master.
2012-11-22 20:14:04 +01:00
Julien Phalip 699a67480a [1.5.x] Modified a staticfiles test to use a unicode character that has just one single representation. The previously used character (ş) has two different representations (u'\u015f' and u's\u0327'), which caused spurious failures when the tests were run across multiple platforms (e.g. on a Linux VM hosted on a Mac). 2012-11-21 09:54:02 +01:00
Preston Holmes 3a0e0230f7 [1.5.x] Fixed #18658 -- Improved ModelAdmin.message_user API
Thanks to Lowe Thiderman for the patch and tests
2012-11-19 16:03:30 -08:00
Tom Christie d881275341 [1.5.x] Test for `ListView.page_kwarg`
(cherry picked from commit f824a95177)
2012-11-17 21:30:47 +01:00
Claude Paroz 3d4f5f6086 [1.5.x] Fixed #19114 -- Fixed LogEntry unicode representation
Thanks niko at neagee.net for the report and Emil Stenstrom for
the patch.
Backport of e0363c688 from master.
2012-11-17 19:21:09 +01:00
Claude Paroz fc379b4865 [1.5.x] Fixed #19036 -- Fixed base64 uploads decoding
Thanks anthony at adsorbtion.org for the report, and johannesl for
bringing the patch up-to-date.
Backport of 2a67374b5 from master.
2012-11-17 17:26:24 +01:00
Claude Paroz 1b6e751430 [1.5.x] Fixed #19226 -- Applied linebreaksbr to read-only fields in admin
Thanks shadow for the report, and Melevir and thiderman for the
patch.
Backport of ec9d6b112 from master.
2012-11-17 17:12:24 +01:00
Jannis Leidel 0aaaad14b7 [1.5.x] Fixed typo introduced in 0e3f7814d7. 2012-11-17 15:59:34 +01:00
Gabriel Hurley dd740e2b2e [1.5.x] Fixed #18210 -- Escaped special characters in reverse prefixes.
Ensured that special characters passed in to reverse via the
prefix argument are properly escaped so that calls to
django.utils.regex_helpers.normalize and/or string formatting
operations don't result in exceptions.

Thanks to toofishes for the error report.

Backport of 90e530978d from master.
2012-11-17 15:51:10 +01:00
Jannis Leidel 0e3f7814d7 [1.5.x] Fixed #19136 -- Properly escape gettext context prefixes in the i18n JavaScript view template.
Backport of 4a5e8087ac from master.
2012-11-17 15:39:34 +01:00
Preston Holmes 0d49fdb573 [1.5.x] Fixed #18985 -- made DeprecationWarnings loud
Capture warnings in Python >= 2.7 and route through
console handler, which is subject to DEBUG==True

Thanks to dstufft for the idea, and claudep for initial patch
2012-11-16 17:08:02 -08:00
Anssi Kääriäinen a1fd9555f2 [1.5.x] Fixed #18347 -- Removed autofield raw SQL inserts from tests
Backpatch of 71e14cf3aa
2012-11-15 17:39:39 +02:00
Claude Paroz ebafba50a4 [1.5.x] Fixed #19272 -- Fixed gettext_lazy returned type on Python 2
Thanks tyrion for the report.
Backport of 550ddc66b from master.
2012-11-14 10:55:12 +01:00
Claude Paroz 8967906e0a [1.5.x] Fixed #19186 -- Fixed sending mail with unicode content on Python 3
Thanks alex_po for the report and Luke Plant for the analysis.
Backport of 1620c27936 from master.
2012-11-14 10:45:57 +01:00
Claude Paroz e6bc0c5bab [1.5.x] Fixed #14264 -- Ensured settings.configure configures logging
Thanks Matt McDonald for the patch.
Backport of 34162698c from master.
2012-11-10 12:10:43 +01:00
Sean Breant 6554137eeb [1.5.x] Fixed #19262 -- Support cookie pickling in SimpleTemplateResponse
Refs #15863.
Backport of 4d817b3887 from master.
2012-11-09 21:11:36 +01:00
Claude Paroz dc95791e61 [1.5.x] Fixed #19261 -- Delayed Queryset evaluation in paginators
Thanks trbs for the report and the patch.
Backport of 1b307d6c8f from master.
2012-11-09 19:44:47 +01:00
Claude Paroz bf35fb6006 [1.5.x] Merged pagination tests
It is simpler/cleaner to have all pagination tests in a single file.
Refs #16122.
Backport of 45802e1248 from master.
2012-11-09 19:44:13 +01:00
Anssi Kääriäinen 908226cf1a [1.5.x] Fixed #17144 -- MySQL again groups by PK only
Thanks to Christian Oudard for the report and tests.

Backpatch of [cafb266954]

Conflicts:

	django/db/models/sql/compiler.py
2012-11-08 01:10:24 +02:00
Claude Paroz e645c89bbb [1.5.x] Fixed #14315 -- Made memcached backend handle negative incr/decr values
Thanks Michael Manfre for the report and initial patch and
Tobias McNulty for the review.

Backport of 79dd751b0b from master.
2012-11-06 12:23:32 +01:00
Claude Paroz a23c9c48a8 [1.5.x] Fixed #8627 -- Prevented textareas to swallow first newline content
Browsers consider the first newline in textareas as some display
artifact, not real content. Hence they are not sending it back to
the server. If we want to keep initial newlines, we have to add one
when we render the textarea.
Thanks bastih for the report and initial patch.

Backport of 78f66691ee from master.
2012-11-05 20:56:25 +01:00
Preston Holmes c7d5e7c75b [1.5.x] Fixed py3 compatibility for 5a00a57aa5 2012-11-04 23:39:56 -08:00
Anton I. Sipos 81342c28c6 [1.5.x] Fixed #18949 -- Fix broken test interactions in ModelForms tests
A test in Model Forms test was specifically referring to a fixed
primary key, which was now being used up in a newly committed.
This has been worked around by specifying a higher primary
key.
2012-11-04 18:37:01 -08:00
Alex Gaynor d35b95c2f4 Merge branch 'stable/1.5.x' of https://github.com/django/django into stable/1.5.x 2012-11-04 15:58:54 -08:00
Alex Gaynor d828d4e186 [1.5.x] Merge pull request #495 from aisipos/ticket_18949
Fixed #18949 -- Improve performance of model_to_dict with many-to-many

Backport of 4d766b3c9a.
2012-11-04 15:58:37 -08:00
Preston Holmes b85cb92ba9 [1.5.x] Fixed #19240 -- include pagination error details in ListView 404
Thanks to seawolf for the patch
2012-11-04 15:52:41 -08:00
Alex Gaynor 69a0c91c90 [1.5.x]Merge pull request #494 from mrj0/model_split
model_split: Fixed #19236 - fixed error for abstract models with a split method

Backport of 8d3f932f18
2012-11-04 14:21:49 -08:00
Alex Gaynor 6f716e9e5f [1.5.x] Fixed #5805 -- it is now possible to specify multi-column indexes. Thanks to jgelens for the original patch. Backport of 4285571c5a. 2012-11-04 10:26:59 -08:00
Aymeric Augustin be6522561f [1.5.x] Fixed #15152 -- Avoided crash of CommonMiddleware on broken querystring
Backport of 973f539 from master.
2012-11-03 21:28:49 +01:00
Aymeric Augustin b99707bded [1.5.x] Fixed #19101 -- Decoding of non-ASCII POST data on Python 3.
Thanks Claude Paroz.

Backport of 095eca8 from master.
2012-11-03 13:07:02 +01:00
Ulrich Petri f12fa7750c [1.5.X] Fixed #17549 -- Added a clickable link for URLFields in admin change list.
Backport of ac2052ebc8 from master.
2012-11-03 11:59:16 +01:00
Tim Graham ffc649df88 [1.5.X] Fixed #15361 - Documented performance considerations for QuerySet.get()
Thanks mmcnickle for the patch.

Backport of feaf9f279a from master
2012-11-02 17:59:51 -04:00
Andrew Godwin f1be2c7a81 Fixed #19070 -- urlize filter no longer raises exceptions on 2.7
Thanks to claudep for the patch.
2012-10-31 11:01:39 +00:00
Claude Paroz 2f9f211da8 [1.5.x] Prevented file_upload tests to leave files behind
Refs #19206.
Backport of 73245b3 from master.
2012-10-30 22:29:09 +01:00
Claude Paroz a24ffa52d0 [1.5.x] Fixed #17744 -- Reset default file storage with setting_changed signal
Backport of 9a0285134 from master.
2012-10-30 22:26:03 +01:00
Claude Paroz 3f3076edbf [1.5.x] Fixed #5076 -- Properly decode POSTs with non-utf-8 payload encoding
Thanks daniel at blogg.se for the report and Aymeric Augustin for
his assistance on the patch.

Backport of 6de6988f9 from master.
2012-10-30 09:01:57 +01:00
Claude Paroz 04717ee9b1 [1.5.x] Prevented leftover files and dirs in admin_scripts tests
Backport of d30516e1 from master.
2012-10-29 19:12:12 +01:00
Luke Plant d7d7ad2881 [1.5.x] Fixed #17991 - prefetch_related fails with GenericRelation and varchar ID field
Thanks to okke@formsma.nl for the report, and carmandrew@gmail.com for the tests.

Backport of ccd14ff25b7642678bf3c9ed8a12643f04853144 from master
2012-10-29 14:41:05 +00:00
Claude Paroz b4627bcabe [1.5.x] Fixed #18575 -- Empty DATABASES should default to dummy backend
Thanks delormemarco@gmail.com for the report.

Backport of f1cc2be0c from master.
2012-10-28 23:46:54 +01:00
Aymeric Augustin 8d7e526229 [1.5.x] Fixed #18964 -- floatformat test passes under py3k
Thanks Russell for the report.

Backport of b4420d9 from master.
2012-10-28 19:58:12 +01:00
Anssi Kääriäinen f105fbe52b [1.5.x] Fixed #18823 -- Ensured m2m.clear() works when using through+to_field
There was a potential data-loss issue involved -- when clearing
instance's m2m assignments it was possible some other instance's
m2m data was deleted instead.

This commit also improved None handling for to_field cases.

Backpatch of 611c4d6f1c
2012-10-28 17:34:14 +02:00