mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 01:55:49 +00:00
Code Issues 25 Releases Wiki Activity
13,952 Commits 28 Branches 426 Tags 666 MiB
f480b39525
Commit Graph

3858 Commits

Author SHA1 Message Date
Honza Král
fc38d6a92b Merge pull request #813 from HiddenData/ticket-19263 
fixes #19263 - EmptyResultSet in subquery causes incorrect SQL
 2013-02-23 15:05:24 -08:00
Marcin Biernat
2b76f19f2b fixes #19263 2013-02-23 23:53:46 +01:00
Honza Král
692902b227 Merge pull request #778 from viciu/19609 
Fixed #19609: admin Inlines doesn't display help_text for readonly fields
 2013-02-23 14:34:57 -08:00
Honza Kral
ef1e6ef1eb Merge branch 'ticket19872' of https://github.com/oinopion/django 2013-02-23 23:32:09 +01:00
Honza Kral
2b48fcc607 Fixed #18491 -- deleting a proxy doesn't show warning about cascade deletes 2013-02-23 23:20:34 +01:00
Tomek Paczkowski
b88abd6840 Fixed #19872 
Made cached_property to behave as property when accessed via class.
 2013-02-23 23:20:00 +01:00
Aleksandra Sendecka
32a7ab2148 Fixed #19526 
CSS specifications governs that syntax is case insensitive.
This modifies CachedFilesMixin to support that.
 2013-02-23 23:05:22 +01:00
Klaas van Schelven
1c11ee6345 Fixed #18829 -- Fixed ModelChoiceIterator length 
Thanks facundo.olano at gmail.com for the report and thikonom for
the initial patch.
 2013-02-23 22:27:07 +01:00
Alex Gaynor
150e202172 Some style fixes for stuff that was clearly brough tover from doctests. 2013-02-23 13:04:08 -08:00
Honza Král
10026c2ad0 Merge pull request #804 from oinopion/ticket18162 
Fixes #18162 --  Specifying choices to Field overrides any form_class argument
 2013-02-23 12:45:39 -08:00
Grzegorz Nosek
2cd0edaa47 Fixed 19895 -- Made second iteration over invalid queryset raise an exception too 
When iteration over a queryset raised an exception, the result cache
remained initialized with an empty list, so subsequent iterations returned
an empty list instead of raising an exception
 2013-02-23 14:35:27 -06:00
Łukasz Langa
539900f117 Fixes #17866: Vary: Accept-Language header when language prefix used 2013-02-23 19:41:33 +01:00
Honza Kral
bfd4a71d41 One last final fix for 0ad76843. Tested on py3 and py2 2013-02-23 19:27:37 +01:00
Honza Král
0a341ab40d Merge pull request #791 from khalas/ticket_19811 
Changed %r to %s in get_language_info error message
 2013-02-23 10:16:23 -08:00
Tomek Paczkowski
b6f4a92ff4 Proposed fix for #18162. 2013-02-23 19:01:38 +01:00
Konrad Hałas
48dc0cbf2a Changed %r to %s in get_language_info error message. 2013-02-23 18:54:54 +01:00
Florian Apolloner
f368c25f10 Fixed errors introduced in 664855b74e 2013-02-23 18:47:36 +01:00
Florian Apolloner
5ae0c933a8 Fixed errors introduced in 21f333bcef. Refs #17751 2013-02-23 18:43:34 +01:00
Claude Paroz
cc53d9b30b Fixed #15877 -- Improved exception when ModelForm has no model class 
Thanks theaspect at gmail.com for the report and volrath for the
patch.
 2013-02-23 18:32:29 +01:00
Wiktor Kolodziej
67dd54dc84 Fixed #19609: admin Inlines doesn't display help_text for readonly fields 
Refactoring: field was renamed to field_name, since flatten_fieldsets returns field name, not field.

Original patch from Marc Aymerich Gubern
 2013-02-23 18:24:32 +01:00
Honza Král
a05ab448f7 Merge pull request #781 from zsiciarz/ticket_19854 
Fixed #19854 -- Added test runner option to skip Selenium tests
 2013-02-23 08:55:34 -08:00
Zbigniew Siciarz
1cd2f51eb4 Added test runner option to skip Selenium tests (#19854). 2013-02-23 17:45:26 +01:00
Claude Paroz
335a060fa6 Minor cleanups in templates test imports 2013-02-23 17:45:05 +01:00
Lennart Regebro
687d2e967d Fixed #19827 -- Kept stacktrace in defaulttags exception reraising 
Thanks Kronuz for the report and the initial patch.
 2013-02-23 17:43:17 +01:00
Honza Král
0ad76843b5 Merge pull request #777 from khalas/ticket_19811 
Fixed #19811 - Added language code fallback in get_language_info
 2013-02-23 08:30:27 -08:00
Honza Král
129d2e8f85 Merge pull request #775 from HiddenData/ticket-18899 
Fixed #18899 -- FileSystemStorage.save should support any file-like objects
 2013-02-23 08:04:41 -08:00
Konrad Hałas
6bd6a56896 Fixed #19811 - Added language code fallback in get_language_info. 2013-02-23 17:02:07 +01:00
Aymeric Augustin
5278776a88 Merge pull request #751 from bmispelon/ticket-6271 2013-02-23 07:47:58 -08:00
Marcin Biernat
664855b74e #18899 FileSystemStorage.save should support any file-like objects 2013-02-23 16:40:50 +01:00
Vladimir A Filonov
f49e9a517f Fixed #17906 - Autoescaping {% cycle %} and {% firstof %} templatetags. 
This commit adds "future" version of these two tags with auto-escaping
enabled.
 2013-02-23 16:16:39 +01:00
Tomek Paczkowski
3dddbc0f23 Fixed #19816: pre-evaluate queryset on m2m set 
In ReverseManyRelatedObjectsDescriptor.__set__, evaluate possible
queryset to avoid problems when clear() would touch data this queryset
returns.
 2013-02-23 15:50:33 +01:00
Baptiste Mispelon
069280a689 Used token.split_contents() for tokenisation in template tags accepting variables. 
Fixed #6271, #18260.
 2013-02-23 15:15:30 +01:00
Erik Romijn
21f333bcef Fix #17751: Added stripping of whitespace for IPAddressField/GenericIPAddressField 2013-02-23 14:44:57 +01:00
Claude Paroz
7ec2a21be1 Fixed #19686 -- Added HTML5 number input type 
Thanks Simon Charette for his help on the patch. Refs #16630.
 2013-02-23 10:18:08 +01:00
Anssi Kääriäinen
dcf651c27e Fixed Oracle specific failures in commands_sql tests 2013-02-23 01:08:48 +02:00
Anssi Kääriäinen
f565c6f999 Marked a test as expected failure. Refs #19884 2013-02-23 00:33:02 +02:00
Anssi Kääriäinen
88c726bea0 Skipped a test on Oracle 2013-02-23 00:33:02 +02:00
Anssi Kääriäinen
09fcb70c80 Fixed empty strings + to_field regression on Oracle 
Querying the reverse side of nullable to_field relation, where both
sides can contain null values resulted in incorrect results. The reason
was not detecting '' as NULL.

Refs #17541
 2013-02-23 00:05:31 +02:00
Baptiste Mispelon
f13bfbec70 Fixed #19882 -- Smarter tokenizing of {% for %} tag arguments. 2013-02-22 19:19:33 +01:00
Anssi Kääriäinen
3c6318e831 Fixed #19870 -- Regression in select_related in inheritance cases 
There was a regression in case two models inherited the same parent,
and one contained a foreign key to other. When select_related travelled
the foreign key the other model reused the parent join made by the
first model. This was likely caused by Query.join_parent_model()
addition in commit 68985db482.

Thanks to Trac alias loic84 for report & tests.
 2013-02-21 12:01:23 +02:00
Anssi Kääriäinen
50677b29af Made a couple of selenium tests wait for page loaded 
The admin_widgets tests were issuing click() to the browser but
didn't wait for the effects of those clicks. This caused the resulting
request to be processed concurrently with the test case. When using
in-memory SQLite this caused weird failures.

Also added wait_page_loaded() to admin selenium tests for code
reuse.

Fixed #19856
 2013-02-20 23:56:57 +02:00
Anssi Kääriäinen
e8fc3f3783 Added a test for negated Q object querying 
The added test is from the patch in ticket #19672 (written by Ian
Kelly). Fixed #19672, refs #19849.
 2013-02-20 21:45:36 +02:00
Anssi Kääriäinen
edf93127bf Removed join() promote kwarg 
The join promote=True was over-aggressive in select_related handling.
After that was removed, the only other user was query.combine(). That
use case is very easy to handle locally, so there is no more need for
the join(promote=True) flag.

Refs #19849.
 2013-02-20 21:43:44 +02:00
Anssi Kääriäinen
3fef304ff2 Refactored negated IS NULL handling 
This one cleaned up add_filter() negated filter generation. As a side
effect split_exclude() was cleaned up, too.

Refs #19849
 2013-02-20 21:34:01 +02:00
Alex Gaynor
b55cde054e Added a db_constraint option to ForeignKeys. 
This controls whether or not a database level cosntraint is created. This is useful in a few specialized circumstances, but in general should not be used!
 2013-02-20 11:27:32 -08:00
Claude Paroz
ae2d04f726 Add test for collapsible fieldset functionality in admin 2013-02-20 13:48:49 +01:00
Aymeric Augustin
35c991aa06 Added a default limit to the maximum number of forms in a formset. 
This is a security fix. Disclosure and advisory coming shortly.
 2013-02-19 11:23:30 -07:00
Carl Meyer
1f39eafd60 Checked object permissions on admin history view. 
This is a security fix. Disclosure and advisory coming shortly.

Patch by Russell Keith-Magee.
 2013-02-19 11:23:30 -07:00
Carl Meyer
c6d69c12ea Restrict the XML deserializer to prevent network and entity-expansion DoS attacks. 
This is a security fix. Disclosure and advisory coming shortly.
 2013-02-19 11:23:30 -07:00
Carl Meyer
d51fb74360 Added a new required ALLOWED_HOSTS setting for HTTP host header validation. 
This is a security fix; disclosure and advisory coming shortly.
 2013-02-19 11:23:29 -07:00