mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity
13,999 Commits 30 Branches 460 Tags
7b49da1c3818cb90f95adaa0b18edaef5f088f16
Commit Graph

3087 Commits

Author SHA1 Message Date
Julien Phalip
ae2a8bb456 Fixed a test that was failing in Python 3. 
The issue was that as of Python 3, the generators' `next()`
method becomes `__next()`. Thanks Alex Gaynor for noticing that.
Refs #19890.
 2013-02-24 13:47:14 -08:00
Julien Phalip
a8449d4362 Merge pull request #824 from ambv/languagecode 2013-02-24 12:56:14 -08:00
Christopher Medrela
636c45fc58 Fixed #19890 -- ifchanged templatetag rendered its content twice 
The content of ifchanged template tag was rendered twice: first time, to
compare it with the previous value and the second time, to return the
rendered output.
 2013-02-24 16:49:28 +01:00
Diederik van der Boor
8503120c10 Fixed #15849 -- Made IfChanged node thread safe. 
Previously, the ifchanged node stored state on `self._last_seen`,
thereby giving undesired results when the node is reused by another
thread at the same time (e.g. globally caching a Template object).

Thanks to akaihola for the report and Diederik van der Boor and
Bas Peschier for the patch.
 2013-02-24 16:06:55 +01:00
Zbigniew Siciarz
0a8402eb05 Test case and docs for custom context data in feeds 
Thanks Paul Winkler for the initial patch. (Ref #18112).
 2013-02-24 08:33:20 -06:00
Łukasz Langa
8c8f94fe9d Fixes #19763 - LocaleMiddleware should check for supported languages in settings.LANGUAGE_CODE 2013-02-24 14:43:45 +01:00
Tomek Paczkowski
99edbe0e27 Fixed #19253 -- Extracted template cache key building logic 
Introduced a public function
django.core.cache.utils.make_template_fragment_key
Thanks @chrismedrela for fruitful cooperation.
 2013-02-24 14:32:45 +01:00
Aymeric Augustin
7106a1e594 Merge pull request #819 from erikr/master 
Fixed #16302 -- Ensured contrib.comments is IPv6 capable.
 2013-02-24 05:02:00 -08:00
Erik Romijn
ade992c61e Fixed #16302 -- Ensure contrib.comments is IPv6 capable 
Changed the ip_address field for Comment to GenericIPAddressField. Added
instructions to the release notes on how to update the schema of existing
databases.
 2013-02-24 13:58:38 +01:00
Bas Peschier
5a9b2bce24 Fixed #19810 -- MemcachedCache now uses pickle.HIGHEST_PROTOCOL 2013-02-24 13:56:15 +01:00
Wiktor Kolodziej
f07a5f0a21 Fixed #11295: If ModelAdmin.queryset returns a filtered QS don't require a 2nd count call 
Original patch rewritten, added tests and get_filters_params method for ChangeList class.
Thanks Alex for the report.
 2013-02-24 13:23:23 +01:00
Florian Apolloner
e4ee3d8fca Fixed a few ResourceWarnings. 2013-02-24 13:11:19 +01:00
Honza Král
e4e1287590 Merge pull request #817 from rybaktomasz/ticket_5568 
Fixes #5568 -- DROP INDEX subcommand
 2013-02-24 04:02:26 -08:00
Honza Kral
cbb9f629b8 Revert "fixes #19263" - Fails if not SQLite 
This reverts commit 2b76f19f2b.
 2013-02-24 12:38:32 +01:00
Tomasz Rybak
d7429defe6 Add sqldropindexes to manage 
Change patch from https://code.djangoproject.com/ticket/5568
to work on modern Django.
Add special case for MySQL which has different syntax for DROP INDEX.
Add unit tests for the new functionality.
 2013-02-24 12:38:28 +01:00
George Song
44164c5c30 Fixed #19896 -- Committed after clearing cache in the database. 2013-02-24 12:15:02 +01:00
Florian Apolloner
f56ca3f0e6 Fixed the usage of the deprecated assertEquals. 2013-02-24 11:15:17 +01:00
Aymeric Augustin
c10ed58746 Caught warnings in the templates tests. Refs #17906. 
This was missing from f49e9a517f.
 2013-02-24 10:28:05 +01:00
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
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
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
Ł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
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
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
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
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