p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,175 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

4302 Commits

Author SHA1 Message Date
Anssi Kääriäinen 161e26c2ec [1.6.x] Fixed #20955 -- select_related regression 
In cases where the same connection (from model A to model B along the
same field) was needed multiple times in a select_related query, the
join setup code mistakenly reused an existing join.

Backpatch of 8d65b6082c.

Conflicts:

	django/db/models/sql/compiler.py
	tests/queries/tests.py
 2013-08-22 10:59:59 +03:00
Florian Apolloner 12d364a9b0 [1.6.x] Fixed #20933 -- Allowed loaddata to load fixtures from relative paths. 
Backport of 6e846f7627 from master.
 2013-08-20 21:28:14 +02:00
Anssi Kääriäinen b189169ed0 [1.6.x] Fixed invalid testing fixture 
Backport of 86f4459f9e from master
 2013-08-20 17:49:00 +03:00
Anssi Kääriäinen 2b1101a4a6 [1.6.x] Fixed #20820 -- Model inheritance + m2m fixture loading regression 
Tests by Tim Graham, report from jeroen.pulles@redslider.net.

Backport of 1ed77e7782 from master
 2013-08-20 17:15:52 +03:00
Simon Charette 3ae585b449 [1.6.x] Fixed a test failure introduced in f0bc2865ff. 
`classobj` objects cannot be weakly referenced on Python 2.6
 2013-08-20 04:08:41 -04:00
Simon Charette f0bc2865ff Fixed #20943 -- Weakly reference senders when caching their associated receivers 
Backport of e55ca60903 from master.
 2013-08-20 02:12:50 -04:00
Tim Graham c769c26601 [1.6.x] Revert "Fixed #18491 -- deleting a proxy doesn't show warning about cascade deletes" 
This reverts commit 2b48fcc607.

It introduced a regression (#20777) which we can't easily fix in 1.6.
 2013-08-16 07:59:16 -04:00
Alasdair Nicol 919934602f [1.6.x] Fixed #20895 -- Made check management command warn if a BooleanField does not have a default value 
Thanks to Collin Anderson for the suggestion and Tim Graham for
reviewing the patch.

Backport of 22c6497f99 from master
 2013-08-15 20:33:02 -04:00
Tim Graham ccff25b143 [1.6.x] Fixed #17778 -- Prevented class attributes on context from resolving as template variables. 
Thanks KyleMac for the report, regebro for the patch, and Aymeric for the test.

Backport of 71b5617c24 from master.
 2013-08-15 10:22:56 -04:00
Florian Apolloner b720ece065 [1.6.x] Removed unneeded conditional_escapes from the testsuite. 
Backport of 4e50e40654 from master.
 2013-08-13 22:24:14 +02:00
Jacob Kaplan-Moss bfbae15c66 Apply autoescaping to AdminURLFieldWidget. 
This is a security fix; disclosure to follow shortly.
 2013-08-13 11:06:00 -05:00
Collin Anderson e3e0cf8a0f [1.6.x] Fixed #20865 -- Fixed raw_id_fields to work with callable limit_choices_to. 
Backport of d53e574676 from master
 2013-08-06 13:44:31 -04:00
Alex Cucu 80b95a2b1f [1.6.x] Fixed #19918 -- Modified select_for_update to run on the write database. 
Backport of 1c64a0f29e from master
 2013-08-06 10:58:32 -04:00
Anssi Kääriäinen 363b81c59c [1.6.x] Fixed ordering related test failure 
Also PEP8 + python_2_unicode_compatible cleanup done.

Backport of 263b873599 from master
 2013-08-06 10:34:42 +03:00
Tim Heap 891cdf120a [1.6.x] Fixed #20850 -- Added MultiWidget.needs_multipart_form 
Backport of 75c87e2d38 from master
 2013-08-05 10:13:48 -04:00
Aymeric Augustin 2eac989985 [1.6.x] Fixed #20822 -- Set content type of default error pages to 'text/html'. 
Thanks Jimmy Song for the patch.

Backport of 7843775 from master.
 2013-08-04 11:04:58 +02:00
Petr Dlouhý 4e7745cc1c [1.6.x] Fixed LogEntry.get_admin_url() for non-existent models. 
Regression introduced by [369b6fa]; refs #18169.

Backport of 1b47508ac8 from master
 2013-08-02 12:51:46 -04:00
Loic Bistuer 4f8fb19994 [1.6.x] Fixed #18681 -- GenericInlineModelAdmin.get_formset() no longer bypasses get_fieldsets(). 
Refs 23e1b59 which already fixed this issue for ModelAdmin and InlineModelAdmin.

Backport of a0ed2f9260 from master
 2013-08-02 10:45:58 -04:00
Aleksandra Sendecka 6e4fd816c4 [1.6.x] Fixed #18777 -- Localized form fields with as_text/as_hidden 
Thanks croldan for the report.

Backport of 893d8de6f5 from master
 2013-08-02 08:43:19 -04:00
Tim Graham 196cc875b2 [1.6.x] Fixed #17519 -- Fixed missing SQL constraints to proxy models. 
Thanks thibaultj for the report, jenh for the patch,
and charettes for the tests.

Backport of aa830009de from master
 2013-08-02 08:42:19 -04:00
Baptiste Mispelon badca4716f [1.6.x] Fixed #10491 -- Allowed passing lazy objects to HttpResponseRedirect. 
Thanks liangent for the report.

Backport of 3c45fb8589 from master
 2013-07-30 13:40:18 -04:00
Florian Apolloner 081a27c358 [1.6.x] Simplified smart_urlquote and added some basic tests. 
Backport of b70c371fc1 from master.
 2013-07-28 10:07:01 +02:00
Tim Graham dbbd2b1272 [1.6.x] Fixed #20805 -- Removed an extra colon beside checkboxes in the admin. 
Thanks CollinAnderson for the report.

Backport of 8676318d2d from master
 2013-07-26 14:47:58 -04:00
Tim Graham 5cc1ea4773 [1.6.x] Updated contrib.admin to use Email/URLInputs; refs #16630 
Backport of 2a979d2a7b from master
 2013-07-26 08:02:10 -04:00
Anssi Kääriäinen 7f892cedba [1.6.x] Fixed related model lookup regression 
It has been possible to use models of wrong type in related field
lookups. For example pigs__in=[a_duck] has worked. Changes to
ForeignObject broke that.

It might be a good idea to restrict the model types usable in lookups.
This should be done intentionally, not accidentally and without any
consideration for deprecation path.

Backpatch of 7cca8d56d2 from master.
 2013-07-26 13:17:50 +03:00
Anssi Kääriäinen d439f85bbf [1.6.x] Fixed ._meta.pk_index() virtual field failure 
Backport of 92476e880c from master
 2013-07-25 16:35:04 +03:00
Claude Paroz 816bf0c6a7 [1.6.x] Fixed #20781 -- Fixed _has_changed regression with MultiValueField 
Thanks Tim Graham for the report.
Backport of 02b0106d from master.
 2013-07-22 09:07:04 +02:00
Claude Paroz 48516d3b85 [1.6.x] Fixed an email validation regression 
Thanks Vincent Wagelaar for the report.
Backport of 11b7b9ad from master.
 2013-07-21 21:12:50 +02:00
Karen Tracey 706e542eb5 [1.6.x] Fixed #13696 -- ensured inline pk field is rendered 
Backport of 3aad955ea8 from master.
 2013-07-21 13:13:20 -04:00
Simon Charette 9d3f7a21a3 [1.6.x] Fixed #20765 -- Set small values of `step` using exponential notation. 
Browsers parse small factors of 10 as 0 under decimal notation.

Thanks to Trac alias matklad for the report and Claude Paroz for the review.

Backport of 415a36947c from master.
 2013-07-19 23:45:29 -04:00
Loic Bistuer c660f0e985 [1.6.x] Fixed #20767 -- Fixed ModelAdmin.preserve_filters for namespaced URLs. 
Thanks Collin Anderson for the report.

Backport of 2fc6c9472c from master.
 2013-07-18 18:23:21 -04:00
Tim Graham e5241902f3 [1.6.x] Fixed #20681 -- Prevented teardown_databases from attempting to tear down aliases 
Thanks simonpercivall.

Backport of d9c580306c from master
 2013-07-13 17:46:37 -04:00
Tim Graham 26b88e7658 [1.6.x] Fixed a deprecation warning in a selenium test. 
Backport of 9b471a8fe3 from master
 2013-07-13 13:22:00 -04:00
Tim Graham 45fab74561 [1.6.x] Fixed #20740 -- GenericIPAddressField should pass protocol to formfield() 
Thanks Jeff250.

Backport of f2cb94f1c0 from master
 2013-07-12 16:06:43 -04:00
Tim Graham aecbaaed0c [1.6.x] Fixed #19196 -- Added test/requirements 
Backport of 4d92a0bd86 from master.
 2013-07-10 09:37:15 -04:00
Aymeric Augustin a2b4af3a1a Fixed #20724 -- Test failure on SQLite. 
This test failure happened if the connection's NAME was set to a file
system path, and its TEST_NAME wasn't.

Thanks Claude for the report.

Conflicts:
	tests/transactions_regress/tests.py

Backport of 404870ee1f from master.
 2013-07-09 21:43:20 +02:00
Aymeric Augustin d200405471 Avoided transaction.set_autocommit in tests. 
It doesn't work as one might expect on a certain database backend where
autocommits_when_autocommit_is_off = True. That backend happens to be
popular for running tests.

Backport of 38bc581bc0 from master.
 2013-07-09 21:42:11 +02:00
Tim Graham d14db25fee [1.6.x] Fixed #19940 -- Made test.runner.setup_databases properly handle aliases for default db. 
Thanks simonpercivall.

Backport of 2cbd579efe from master.
 2013-07-04 20:15:27 -04:00
Tim Graham 4c1029971e [1.6.x] Fixed a couple form/formset deprecation warnings in tests. 
Backport of a521d10322 from master.
 2013-07-01 09:38:29 -04:00
Tim Graham 3c51962cab [1.6.x] Updated tests for deprecation of Option.get_(add|change|delete)_permission. 
refs #20642.

Backport of a6a905c619 from master.
 2013-07-01 09:21:07 -04:00
Aymeric Augustin d255004289 [1.6.x] Stopped calling loaddata with commit=False. 
This was a stealth option only used by the tests, and it isn't useful
any more since `atomic` provides nested transactions.

Backport of 2c40681 from master.
 2013-06-30 14:20:29 +02:00
Claude Paroz 59be2c6875 [1.6.x] Fixed #18592 -- Prevented crash when accessing MySQL _last_executed 
Thanks reames at asymmetricventures.com for the report.
Backport of 59b0c48ce from master.
 2013-06-29 18:48:05 +02:00
Claude Paroz a9b5a1e506 [1.6.x] Do not allow FileSystemStorage.delete to receive an empty name 
Refs #20660.
Backport of 7fbab3eba from master.
 2013-06-29 18:12:23 +02:00
Claude Paroz b6aed803b2 [1.6.x] Fixed #20660 -- Do not try to delete an unset FieldFile 
Thanks stanislas.guerra at gmail.com for the report and
Baptiste Mispelon for the review.
Backport of ea3fe78a9d from master.
 2013-06-29 18:11:51 +02:00
Shai Berger d097417025 Support 'pyformat' style parameters in raw queries, Refs #10070 
Add support for Oracle, fix an issue with the repr of RawQuerySet,
add tests and documentations. Also added a 'supports_paramstyle_pyformat'
database feature, True by default, False for SQLite.

Thanks Donald Stufft for review of documentation.
 2013-06-28 06:59:10 +03:00
Tim Graham 7c0b72a826 Prevented running some admin_view tests twice. 2013-06-27 20:13:42 -04:00
Tim Graham 534ced5aad Fixed #20664 -- Fixed a bug with raw_id_fields on Python 3. 
Thanks jefftriplett for the report.
 2013-06-27 19:39:20 -04:00
Aymeric Augustin c1284c3d3c Fixed #20571 -- Added an API to control connection.needs_rollback. 
This is useful:
- to force a rollback on the exit of an atomic block without having to
  raise and catch an exception;
- to prevent a rollback after handling an exception manually.
 2013-06-27 22:19:54 +02:00
Andrew Godwin 99b467f272 Add related_query_name to ForeignKey/M2M. Refs #20244 2013-06-27 14:44:21 +01:00
Loic Bistuer a9ea7d8c70 Fixed #20462 - Replaced the str() cast introduced in 273dc55 by force_text() 2013-06-26 21:30:58 +07:00