mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-02-28 11:34:28 +00:00
Code Issues 32 Releases Wiki Activity
20,053 Commits 29 Branches 434 Tags
Commit Graph

6476 Commits

Author SHA1 Message Date
Karl Hobley
a8c53041f9 [1.8.x] Fixed #24495 -- Allowed unsaved model instance assignment check to be bypassed. 
Backport of 81e1a35c364e5353d2bf99368ad30a4184fbb653 from master
 2015-03-18 19:12:46 -04:00
Tim Graham
247251c2e1 [1.8.x] Refs #24483 -- Added a test for deconstruction of Field.choices 
Backport of b4a56ed4f55502239cb11b57f0fa75baa0a97640 from master
 2015-03-18 13:56:33 -04:00
Moritz Sichert
571e093a25 [1.8.x] Refs #24469 -- Fixed escaping of forms, fields, and media in non-Django templates. 
Backport of 6bff3439894ac22d80f270f36513fc86586273f3 from master
 2015-03-18 09:11:44 -04:00
Josh Smeaton
a0cebe82b5 [1.8.x] Refs #24485 -- Renamed some expression types 
Backport of 88d798d71a20662bdf5335f0586fb9eb6e660c57 from master
 2015-03-17 08:40:45 -04:00
Josh Smeaton
34e09e532d [1.8.x] Fixed #24486 -- Fixed error with datetime and DurationField arithmetic 
Backport of ff2aa4019259947734c4791d6afc9f5405d901d0 from master
 2015-03-17 08:36:15 -04:00
John Giannelos
e150bbd4d6 [1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging. 
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddbbf7a2626bd84d50cfe83b477e8de0a from master
 2015-03-16 19:45:55 -04:00
Marten Kenbeek
febcbbf89d [1.8.x] Fixed #24488 -- Made create_default_site() use default pk of 1. 
Fixed create_default_site() to use a default value in case
settings.SITE_ID isn't set; refs #23945.

Backport of 818182b514d1c6b379130c440689355b4d231d49 from master
 2015-03-16 13:31:22 -04:00
Matthew Wilkes
22a67d22e9 [1.8.x] Refs #24354 -- Prevented repointing of relations on superclasses when migrating a subclass's name change 
Forwardport of test and release note from stable/1.7.x

Backport of ae87ad005f7b62f5fa5a29ef07443fa1bbb9baf0 from master
 2015-03-14 15:47:10 -04:00
Tim Graham
aba74d6f1e [1.8.x] Fixed escaping regression in urlize filter. 
Now that the URL is always unescaped as of refs #22267,
we should re-escape it before inserting it into the anchor.

Backport of 7b1a67cce52e5c191fbfa1bca501c6f0222db019 from master
 2015-03-10 19:12:20 -04:00
Baptiste Mispelon
35d68e8e76 [1.8.x] Refs #24461 -- Added test/release notes for XSS issue in ModelAdmin.readonly_fields 
This issue was fixed by refs #24464.
 2015-03-09 10:15:12 -04:00
Erik Romijn
d16e4e1d6f [1.8.x] Fixed #24464 -- Made built-in HTML template filter functions escape their input by default. 
This may cause some backwards compatibility issues, but may also
resolve security issues in third party projects that fail to heed warnings
in our documentation.

Thanks Markus Holtermann for help with tests and docs.

Backport of fa350e2f303572ee8f9a8302dda45a12288d3d95 from master
 2015-03-09 09:31:07 -04:00
Anssi Kääriäinen
3a0fe942dd [1.8.x] Fixed #24171 -- Fixed failure with complex aggregate query and expressions 
The query used a construct of qs.annotate().values().aggregate() where
the first annotate used an F-object reference and the values() and
aggregate() calls referenced that F-object.

Also made sure the inner query's select clause is as simple as possible,
and made sure .values().distinct().aggreate() works correctly.

Backport of fb146193c49e4c683dc8da39d9b7c479375fdb57 from master
 2015-03-09 07:51:05 -04:00
Aymeric Augustin
311b880fa9 [1.8.x] Prevented some tests from writing in the CWD. 
Backport of 90b069c33f3f8785a7d068a2032f130d2dbb0c75 from master
 2015-03-07 10:40:17 -05:00
Jean-Louis Fuchs
1ae2df6bfc [1.8.x] Fixed #24447 -- Made migrations add FK constraints for existing columns 
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060feaee6bbd76a0d575487682bc541111e4 from master
 2015-03-07 14:15:27 +01:00
Claude Paroz
ac07890f95 [1.8.x] Fixed urlize regression with entities in query strings 
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
 2015-03-06 22:22:51 +01:00
Josh Smeaton
823f8cdbc9 [1.8.x] Fixed #24420 -- Allowed ordering by case expressions 
Backport of ceaf31adfff3801f1092a215f73704e15a70e90c from master
 2015-03-06 13:31:43 +11:00
Tim Graham
20bf320502 [1.8.x] Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False. 
Backport of 36a17be9f3cf6081f7e6f83fcfeae3d09ce8a72b from master
 2015-03-04 13:56:51 -05:00
Markus Holtermann
bff446c205 [1.8.x] Fixed #24435 -- Prevented m2m field removal and addition in migrations when changing blank 
Thanks Mark Tranchant for the report and Tim Graham for the test and
review.

Backport of a9e29fae105d1ddd4e0ac2059cbe62b0ee348bc8 from master
 2015-03-04 15:44:38 +01:00
Claude Paroz
c0df8d1be9 [1.8.x] Fixed #24413 -- Prevented translation fallback for English 
Thanks Tomasz Kontusz for the report, Baptiste Mispelon for
analysis and Tim Graham for the review.
Backport of 3cf1c02695 from master.
 2015-02-28 10:09:01 +01:00
Claude Paroz
b825ec38c1 [1.8.x] Fixed #24418 -- Prevented crash in refresh_from_db with null fk 
Thanks Johannes Lerch for the report, Tim Graham for the test case,
and Simon Charette for the review.
Backport of 5cf96b49e4 from master.
 2015-02-27 20:25:12 +01:00
Michael Angeletti
278b698794 [1.8.x] Fixed #24391 -- Made BoundField.value() cache callable values. 
Backport of 65441bbdb02427655869c42791a0bc5a9c631292 from master
 2015-02-24 20:05:16 -05:00
Stanislas Guerra
a3fca05b05 [1.8.x] Fixed #24395 -- Ensured inline ModelsForms have an updated related instance. 
Backport of 4c2f546b55c029334d22e69bb29db97f9356faa3 from master
 2015-02-24 11:49:27 -05:00
Preston Timmons
450b42eafe [1.8.x] Cleaned up template directory handling in template tests. 
Backport of 8e129b42ad9c9adca599228ae2ad68271fa46d44 from master
 2015-02-24 09:22:25 -05:00
Preston Timmons
b22d20dd18 [1.8.x] Combined TemplateTests and TemplateRegressionTests. 
Backport of 32c108a221c54a4f680afe32175d70b5d2e92593 from master
 2015-02-24 09:22:20 -05:00
Preston Timmons
2e7414cdf4 [1.8.x] Moved test_token_smart_split into ParserTests. 
Backport of 25a0b5cdcd5e70a6563116639a477b915ee5784e from master
 2015-02-24 09:22:15 -05:00
Preston Timmons
e15292daa0 [1.8.x] Moved ifchanged tests into syntax_tests/test_if_changed.py. 
Backport of 3d8fee605184d8ffa47a32546298b52b52d7a087 from master
 2015-02-24 09:22:05 -05:00
Preston Timmons
f3a49c628e [1.8.x] Moved cache tests into syntax_tests/test_cache.py. 
Backport of f6d087b628a61a7b036cc468328497082031dc8e from master
 2015-02-24 09:21:54 -05:00
Preston Timmons
d8114552a0 [1.8.x] Moved RequestContextTests into test_context. 
Backport of 250a3d199310a954a95fb1ffa4915f0e51ba1767 from master
 2015-02-24 09:18:28 -05:00
Preston Timmons
c1bf9e47ec [1.8.x] Moved TemplateTagLoading cases into test_custom. 
Backport of ff67ce5076c1f4d3dc32fd755a1b65d3310c6cb1 from master
 2015-02-24 09:17:45 -05:00
Preston Timmons
272208c124 [1.8.x] Moved include tests into syntax_tests/test_include.py. 
Backport of 06ffc764a9b2d2521e6a574d279b66ad411cc65c from master
 2015-02-24 09:10:01 -05:00
Preston Timmons
cdb73ec8cd [1.8.x] Moved ssi tests into syntax_tests/test_ssi.py. 
Backport of 441a47e1efd46001ca454b80e0d5f8c5ea4e235b from master
 2015-02-24 09:09:52 -05:00
Tim Graham
210bf24ddb [1.8.x] Cleaned up template loader tests. 
Backport of 1827aa902481cd80d2fb154e7b073f139936d5fc from master
 2015-02-24 08:59:05 -05:00
Nik Nyby
3e0df285fd [1.8.x] Fixed typos in flatpages_tests comments. 
Backport of 2be6b526568aaaae5353a4a600a085d3c2135363 from master
 2015-02-24 06:31:59 -05:00
Aymeric Augustin
e3953de900 [1.8.x] Normalized usage of the tempfile module. 
Specifically stopped using the dir argument.

Backport of a8fe12417f778a76837f8e4f8503779f52a396ba from master
 2015-02-23 15:26:35 -05:00
Aymeric Augustin
fae31f2348 [1.8.x] Guaranteed removal of temporary files during tests. 
Dropped the DJANGO_TEST_TEMP_DIR environment variable.

Before this change, proper removal depended on the developer passing
dir=os.environ['DJANGO_TEST_TMP_DIR'] to tempfile functions.

Backport of 934400759de817471ff37d736686201d7ae34e82 from master
 2015-02-23 15:26:26 -05:00
Tim Graham
41d5ed480c [1.8.x] Fixed #24377 -- Fixed model inline formsets with primary key's that have defaults. 
Backport of 1306cd1e8acfb13602ee8dc40993b2505cd7523b from master
 2015-02-23 09:01:00 -05:00
Anssi Kääriäinen
155a127afb [1.8.x] Fixed #24381 -- removed ForeignObjectRel opts and to_opts 
These cached properies were causing problems with pickling, and in
addition they were confusingly defined: field.rel.model._meta was
not the same as field.rel.opts.

Instead users should use field.rel.related_model._meta inplace of
field.rel.opts, and field.rel.to._meta in place of field.rel.to_opts.

Backport of f95122e541df5bebb9b5ebb6226b0013e5edc893 from master
 2015-02-23 07:26:10 -05:00
Marten Kenbeek
980dfca717 [1.8.x] Fixed #24366 -- Optimized traversal of large migration dependency graphs. 
Switched from an adjancency list and uncached, iterative depth-first
search to a Node-based design with direct parent/child links and a
cached, recursive depth-first search. With this change, calculating
a migration plan for a large graph takes several seconds instead of
several hours.

Marked test `migrations.test_graph.GraphTests.test_dfs` as an expected
failure due to reaching the maximum recursion depth.

Backport of 78d43a5e1064b63db1c486516c4263ef1c4c975c from master
 2015-02-23 12:55:43 +01:00
Aymeric Augustin
c564033408 [1.8.x] Fixed #24389 -- Isolated the CSRF view from the TEMPLATES setting. 
Thanks uranusjr for the report and analysis.

Backport of 88a5f17 from master
 2015-02-22 15:47:11 +01:00
Michael Angeletti
1feeefe918 [1.8.x] Fixed #24376 -- added verbose_name arg to UUIDField 
Backport of ea3168dc6ced391d848c511a14cfcecfeac9d401 from master
 2015-02-21 14:26:47 -05:00
Aymeric Augustin
481d3bd617 [1.8.x] Removed obsolete reference to media directory. 
Backport of 787dd6519a791f210dc8275eaf2fd41454bf9670 from master
 2015-02-21 13:08:15 -05:00
Aymeric Augustin
82e323167d [1.8.x] Removed workaround for SVN limitations. 
In addition to simplifying the code, this reduces the number of writes.

Backport of bd059e3f8c6311dcaf8afe5e29ef373f7f84cf26 from master
 2015-02-21 13:07:59 -05:00
Aymeric Augustin
de3bda9cd3 [1.8.x] [1.8.x] Avoided collecting admin static files in tests. 
This makes the staticfiles tests 2.5 times faster.

Backport of 2bb5b0e09863df65756fe0050406163cb70750f1 from master

Backport of bd059e3f8c6311dcaf8afe5e29ef373f7f84cf26 from master
 2015-02-21 13:07:42 -05:00
Aymeric Augustin
5c02c75068 [1.8.x] Removed TestServeAdminMedia. 
It should have been removed when the ADMIN_MEDIA_PREFIX setting was deprecated.

Backport of 1d9d39fa1c60896e31360d5f8d6b972979ee7c95 from master
 2015-02-21 13:05:11 -05:00
Loic Bistuer
850b2ca794 Removed zombie file again. 
Refs 5355baf6c770ac1e5c7f7a4f86ef95042f76b8b4.
 2015-02-21 22:34:00 +07:00
Loic Bistuer
1b73c764d4 Fixed a couple of allow_migrate routers in tests. 
This reverts commit 88e6fbb2e341657cb5365b9b78fb44e3c7065d2d.
 2015-02-21 21:44:05 +07:00
foresmac
3207fcd0a0 [1.8.x] Fixed #24341 -- Added specific error messages to RangeField subclasses 
Backport of 1d1d5d1c315e0e58f02a7f2a07b56ed20b09c087 from master
 2015-02-20 16:50:41 -05:00
Tim Graham
88e6fbb2e3 Silenced a deprecation warning in commands_sql test. 2015-02-20 13:24:29 -05:00
Tim Graham
5355baf6c7 Removed an inadvertently added test directory. 2015-02-20 13:16:42 -05:00
Anssi Kääriäinen
6f03a4ca91 [1.8.x] Fixed #24328 -- cleaned up Options._get_fields() implementation 
Backport of bad5f262bf4a17f157808ec1aa225ba9c94c1eee from master
 2015-02-20 13:11:59 -05:00