mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-20 06:10:46 +00:00
Code Issues32 Releases Wiki Activity
18,394 Commits 29 Branches 438 Tags
e10c5a8fdd
Commit Graph

5644 Commits

Author SHA1 Message Date
Alasdair Nicol
f91c6ecc22 [1.7.x] Fixed -- documented how to assign errors to a field in Model.clean() 
Also added a unit test wit the simpler syntax which we have documented,
where the dictionary values are strings.

Backport of 5b26a014a81ba0d404d46e11d2b45c01d92b97e5 from master
 2014-11-21 13:02:40 -05:00
Andrzej Pragacz
feded19104 [1.7.x] Fixed -- Fixed migrations crash when removing a field that's part of index/unique_together. 
Backport of 72729f844e0dd9bd01b3874171b89ab0d136a40e from master
 2014-11-21 10:57:38 -05:00
Markus Holtermann
145467a636 [1.7.x] Fixed duplicate index error on Oracle; refs . 
Refers to regression introduced in 7b4a994599b75a07cb07d1e0cc26b3bbf25ab7a6

Backport of 4c709cc0ef0daa2b527e056865f51796fb0d42f3 from master
 2014-11-20 14:44:05 -05:00
Anssi Kääriäinen
01f2cf2aec [1.7.x] Fixed -- Fixed nested subquery regression 
Added relabeled_clone() method to sql.Query to fix the problem. It
manifested itself in rare cases where at least double nested subquery's
filter condition might target non-existing alias.

Thanks to Trac alias ris for reporting the problem.

Backport of 5c481db29572a387651681b43d5d4523f96b3793 from master
 2014-11-20 13:53:28 -05:00
Markus Holtermann
1b8c067a4f [1.7.x] Cleaned up and reformatted autodetector tests 
Backport of 233165083593baf5f62194f50df26fb830e5f570 from master.
 2014-11-19 18:25:00 -05:00
Markus Holtermann
2f8cd09a06 [1.7.x] Formatted model states in autodetector tests 
Backport of f17acd59303a27876966927869af7f4bfe38a74a from master.
 2014-11-19 18:25:00 -05:00
Carl Meyer
03e8c18288 [1.7.x] Fixed -- Avoided unnecessary rollbacks in related apps when migrating backwards. 
Backport of ab2819aa7b09d36d9ff24830a9825aa52b87fdb4 from master.
 2014-11-19 16:15:05 -07:00
Stratos Moros
50434aebe2 [1.7.x] Fixed -- Made RenameModel reversible 
Backport of cf7a2a000e from master
 2014-11-19 09:51:07 -05:00
Tillmann Karras
dfcac7d7f5 [1.7.x] Fixed -- Made makemigrations respect --no-optimize. 
Thanks to yamila-moreno for the idea of a skip message.

Backport of d18810131995dac63f9d89b0beaeadfc935130aa from master
 2014-11-18 09:20:04 +01:00
Markus Holtermann
03d983f7c3 [1.7.x] Fixed -- Fixed a migration crash when a field is renamed that is part of an index_together 
Backport of 7b4a994599b75a07cb07d1e0cc26b3bbf25ab7a6 from master.
 2014-11-17 15:57:19 -07:00
Adam DePue
2d12a59938 [1.7.x] Fixed -- Fixed crash with MySQL validator and db_type is None. 
The issue was fixed on master in e9103402c0fa873aea58a6a11dba510cd308cb84.
 2014-11-13 11:03:01 +01:00
Tim Graham
d4bec655ae [1.7.x] Fixed flake8 warning. 
Backport of dec7da3c4c from master
 2014-11-13 10:08:17 +01:00
Baptiste Mispelon
606c57a132 [1.7.x] Fixed -- Fixed a regression in custom form fields 
Custom form fields having a `queryset` attribute but no
`limit_choices_to` could no longer be used in ModelForms.

Refs .

Thanks to artscoop for the report.

Backport of bfb11b95626f39e2f5e18d97d7761c6f93dcc1a9 from master.

Conflicts:
	django/forms/fields.py
 2014-11-12 22:46:00 +01:00
Markus Holtermann
1f50ea730e [1.7.x] Fixed -- Changed serialization strategy for floats with respect to NaN and Inf 
Thanks to w0rp for the report

Backport of c7c098cf97fbb1416f302c76799058ad63a5f7aa from master.
 2014-11-06 15:31:30 +01:00
Veres Lajos
6b32adda59 [1.7.x] Fixed typos using https://github.com/vlajos/misspell_fixer 
Backport of a71a2ea756 from master
 2014-11-03 21:07:05 -05:00
Andy Chosak
12e5b87b89 [1.7.x] Fixed - broken warning for unbound naive datetime objects 
Fixed issue with warning message displayed for unbound naive datetime
objects when USE_TZ is True. Adds unit test that demonstrates the issue
(discoverable when using a custom lookup in MySQL).

Backport of ceb1ffcc8d from master.

Conflicts:
	tests/custom_lookups/tests.py
 2014-11-03 15:59:17 +02:00
Markus Holtermann
40ad022d5e [1.7.x] Fixed -- Allowed migrating from NULL to NOT NULL with the same default value 
Thanks to Andrey Antukh for the report.

Backport of 715ccfde24 from master
 2014-10-31 13:30:56 -04:00
Aymeric Augustin
12bace46c1 [1.7.x] Avoided using private API get_template_from_string. 
Conflicts:
	django/contrib/webdesign/tests.py

Backport of c0c1bb9e from master.
 2014-10-31 11:43:54 +01:00
Markus Holtermann
21358e7225 [1.7.x] Fixed -- Changed the way the migration autodetector orders unique/index_together 
Thanks to Naddiseo for the report and Tim Graham for the review

Backport of 5c9c1e029d from master
 2014-10-29 13:16:23 -04:00
Claude Paroz
6a1bd837b1 [1.7.x] Fixed -- Fixed makemessages crash when STATIC_ROOT=None 
Backport of 528c9af54 from master.
 2014-10-27 13:59:09 +01:00
Tim Graham
abee4f718e [1.7.x] Fixed stable/1.7.x test failures from refs . 2014-10-27 08:19:57 -04:00
Tim Graham
af1c85e851 [1.7.x] Fixed flake8 warning. 
Backport of ef9e3c5ed8 from master
 2014-10-27 07:13:47 -04:00
Tim Graham
5cc8180a65 [1.7.x] Fixed -- Prevented flush from loading initial data for apps with migrations. 
Backport of dd1ea70779 from master.
 2014-10-27 07:13:05 -04:00
Claude Paroz
b42930e4b7 [1.7.x] Fixed -- Officially recommended mysqlclient as MySQL driver 
Thanks Corey Farwell for the report and Tim Graham for the review.
Thanks also to Inada Naoki for creating and maintaining mysqlclient.
Backport of 7f089ac2e3 from master.
 2014-10-27 09:17:31 +01:00
Loic Bistuer
7fa6781f81 [1.7.x] Fixed -- Warn for duplicate models when a module is reloaded. 
Previously a RuntimeError was raised every time two models clashed
in the app registry. This prevented reloading a module in a REPL;
while it's not recommended to do so, we decided not to forbid this
use-case by turning the error into a warning.

Thanks dfunckt and Sergey Pashinin for the initial patches.

Backport of 8c4ca16c65 and b62f72498a from master
 2014-10-26 00:12:17 +07:00
Tim Graham
7750fc8fa8 [1.7.x] Fixed -- Fixed adding an explicit id field on SQLite. 
Thanks gavinwahl for the report.

Backport of 92269b7b53 from master
 2014-10-23 14:35:55 -04:00
Tim Graham
f70a733abc [1.7.x] Fixed -- Made AlterModelTable rename auto-created M2M tables. 
Thanks Naddiseo for the report, Andrew Godwin for guidance,
and Shai Berger for review.

Backport of 41b337efa0 from master
 2014-10-23 08:51:08 -04:00
Claude Paroz
d5a273eadb [1.7.x] Fixed -- More selectively ignored static/media roots 
Fixed a regression introduced by 28efafa24c.
Thanks Michal Čihař for the report and initial patch, and
Collin Anderson and Tim Graham for the reviews.
Backport of 8b4cc9df9c from master.
 2014-10-21 20:20:26 +02:00
Claude Paroz
53bc81dca3 [1.7.x] Fixed -- Allowed test client data to be an empty string 
This fixes a regression introduced by 2a31d00933.
Thanks tony-zhu for the report.
Backport of f0bb3c98cc from master.
 2014-10-21 09:17:42 +02:00
Simon Charette
117e970610 [1.7.x] Fixed a flake8 warning. 
Backport of f6c208d95c from master
 2014-10-20 13:17:00 -04:00
Tianyi Wang
3f3bed8fb9 [1.7.x] Fixed -- Allowed autodetector to detect changes in Meta.db_table. 
Thanks Naddiseo for reporting.

Backport of 5732424bee from master
 2014-10-20 13:15:34 -04:00
Rigel Di Scala
e8262b5941 [1.7.x] Fixed -- Validate that a Model instance's "check" attribute is a method. 
The "check" name is a reserved word used by Django's check framework,
and cannot be redefined as something else other than a method, or the check
framework will raise an error.

This change amends the django.core.checks.model_check.check_all_models()
function, so that it verifies that a model instance's attribute "check"
is actually a method. This new check is assigned the id "models.E020".

Conflicts:
	docs/ref/checks.txt

Backport of a5c77417a6 from master
 2014-10-17 00:36:43 +07:00
Claude Paroz
da0ebe39f6 [1.7.x] Fixed -- Isolated non-existent fixture tests 
Previous versions of the tests were buggy, as initial_data.json
did exist and the test wasn't failing. It was finally failing on
Python 3.4.2.
Thanks Raphaël Hertzog for the report (and Debian bug 
contributors).
Backport of 7a893ee771 from master.
 2014-10-15 09:18:14 +02:00
Claude Paroz
555952c3e6 [1.7.x] Adapted invalid cookie test to all Python versions 
Refs . Older Python versions are less strict when parsing
invalid cookie content. The test just has to ensure Django doesn't
crash.
 2014-10-14 09:59:14 +02:00
Claude Paroz
6398ebab93 [1.7.x] Fixed -- Prevented crash while parsing invalid cookie content 
Thanks Philip Gatt for the report and Tim Graham for the review.
Backport of 59d487e7fc from master.
 2014-10-13 17:39:23 +02:00
Florian Apolloner
bc13a08f89 [1.7.x] Fixed -- Convert \n and \r to \r\n when using the SMTP backend as per RFC. 
Backport of 8d789449c7861b8cf8b10d244f26d9d354989aaf from master.
 2014-10-12 22:03:01 +02:00
Konrad Świat
fd3dccb8dd [1.7.x] Fixed - Fixed generic relations in ModelAdmin.list_filter. 
Thanks ranjur for reporting bug, timgraham for review,
and collinanderson for contributing tips.

Backport of 06b11b617e from master
 2014-10-10 13:12:26 -04:00
Markus Holtermann
71988ed953 [1.7.x] Fixed -- Fixed IntegrityError that prevented altering a NULL column into a NOT NULL one due to existing rows 
Thanks to Simon Charette, Loic Bistuer and Tim Graham for the review.

Backport of f633ba778d from master
 2014-10-09 22:41:27 +07:00
Rudy Mutter
e31be40f16 [1.7.x] Fixed -- Added support for timezone-aware datetimes to migrations. 
Backport of a407b846b4 from master
 2014-10-09 22:39:17 +07:00
Ian Foote
d830665007 [1.7.x] Fixed -- Made urlsafe_base64_decode() return proper type on Python 3. 
Backport of 03d89168a2 from master
 2014-10-08 14:03:46 -04:00
André Ericson
fa4b6482df [1.7.x] Fixed -- update_or_create failing from a related manager 
Added update_or_create to RelatedManager, ManyRelatedManager and
GenericRelatedObjectManager.
Added missing get_or_create to GenericRelatedObjectManager.

Conflicts:
	tests/generic_relations/tests.py
	tests/get_or_create/tests.py

Backport of ed37f7e979 from master
 2014-10-08 04:55:47 +07:00
Tim Graham
96f022203a [1.7.x] Fixed -- Fixed crash in AdminEmailHandler with non-ASCII characters in request. 
Thanks edevil for the report and Simon Charette for review.

Backport of 9dff5ce7c7 from master
 2014-10-06 17:37:38 -04:00
Markus Holtermann
c2508990cb [1.7.x] Fixed -- Ensured view exists in URLconf before importing it in admindocs. 
Backport of 2f16ff5a6c from master
 2014-10-06 13:44:01 -04:00
Loic Bistuer
082abce81e [1.7.x] Fixed -- Fixed deepcopy on ErrorList. 
Thanks Troy Grosfield for the report and Tim Graham for the tests.

Backport of ec2fd02bb3 from master
 2014-10-07 00:14:11 +07:00
Emmanuelle Delescolle
f8d845910b [1.7.x] Fixed -- Allowed related m2m fields to be references in the admin. 
Thanks Simon Charette for review.

Backport of a24cf21722 from master
 2014-10-06 08:43:05 -04:00
Tim Graham
4743a94429 [1.7.x] Required numpy < 1.9 for tests; refs . 2014-09-29 19:31:29 -04:00
Loic Bistuer
7355885ef5 [1.7.x] Fixed -- Fixed MigrationWrite to handle builtin types without imports. 
Thanks Tim Graham for the review.

Backport of b23d47412c from master
 2014-09-27 00:40:35 +07:00
Markus Holtermann
e8a08514de [1.7.x] Fixed -- Forced related_name to be a unicode string during deconstruction. 
Backport of 45bd7b3bd9 from master
 2014-09-25 17:50:50 -04:00
Markus Holtermann
00c2a721e2 [1.7.x] Fixed -- Added fields for unmanaged and proxy model migrations. 
Thanks sky-chen for the report.

Backport of 215aa4f53b from master
 2014-09-25 10:28:11 -04:00
Tim Graham
d7b32d3120 [1.7.x] Revert "Fixed -- Prevented migrating backwards from unapplying the wrong migrations." 
Backport of d7ab2cefb7 from master
 2014-09-24 15:56:24 -04:00