mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-02-01 21:29:24 +00:00
Code Issues 32 Releases Wiki Activity
14,692 Commits 29 Branches 430 Tags
Commit Graph

4125 Commits

Author SHA1 Message Date
Anssi Kääriäinen
190771d003 Fixed fixtures testing failure 
The failure was caused by generating the same warning from two tests.
The second time the same warning was raised it was swallowed by the
"once" simplefilter of warnings.
 2013-05-19 20:53:49 +03:00
Preston Holmes
6786920fd8 Fixed #16330 -- added --pks option in dumpdata command 
Thanks to guettli for the initial ticket and patch, with additional work
from mehmetakyuz and Kevin Brolly.
 2013-05-19 09:10:40 -07:00
Bozidar Benko
2d309a7043 Fixed #15961 -- Modified ModelAdmin to allow for custom search methods. 
This adds a get_search_results method that users can override to
provide custom search strategies.

Thanks to Daniele Procida for help with the docs.
 2013-05-19 16:45:00 +02:00
Aymeric Augustin
b06f6c1618 Fixed test failure introduced in 1927bf7c91. 2013-05-19 16:23:14 +02:00
Pablo Recio
65f9e0affd Fixes #18896. Add tests verifying that you can get IntegrityErrors using get_or_create through relations like M2M, and it also adds a note into the documentation warning about it 2013-05-19 14:16:12 +02:00
Aymeric Augustin
d34b1c29e2 Merge pull request #1161 from erikr/urlize-additional-test 
Fixed #19070 -- Additional test for urlize and brackets
 2013-05-19 04:59:15 -07:00
Aymeric Augustin
f7467181aa Merge pull request #1160 from erikr/host-inet-postgres2 
Fixed #11442 -- Postgresql backend casts all inet types to text
 2013-05-19 04:57:10 -07:00
Erik Romijn
1927bf7c91 Fix #19070 -- Additional test for urlize and brackets 2013-05-19 13:39:21 +02:00
Erik Romijn
60d94c2a80 Fixed #11442 -- Postgresql backend casts all inet types to text 2013-05-19 13:28:09 +02:00
Łukasz Langa
660762681c Fixed #20126 -- XViewMiddleware moved to django.contrib.admindocs.middleware 2013-05-19 13:18:35 +02:00
Aymeric Augustin
cb86f707a0 Fixed #12747 -- Made reason phrases customizable. 2013-05-19 13:14:54 +02:00
Aymeric Augustin
3129d19071 Merge pull request #1152 from ambv/issue11915 
Fixed #11915: generic Accept-Language matches country-specific variants
 2013-05-19 04:01:20 -07:00
Andrew Godwin
04e0fc029f Merge pull request #1094 from senko/ticket_11160 
Fixed #11160: Formset non_form_errors returns ErrorList() if is_valid is not called
 2013-05-19 03:56:14 -07:00
Andrew Godwin
7a99d1e167 Merge pull request #1134 from senko/ticket_18990 
Fixed #18990: Loaddata now complains if fixture doesn't exist
 2013-05-19 03:54:29 -07:00
Łukasz Langa
26e3e7ecb5 Fixed #11915: generic Accept-Language matches country-specific variants 2013-05-19 12:50:09 +02:00
Senko Rasic
65c557115f fix warnings imports in fixtures tests 2013-05-19 12:49:03 +02:00
Honza Kral
4ad1eb1c14 Fixed #12674 -- provide a way to override admin validation 
Moved admin validation code to classes and have those be class
attributes to the ModelAdmin classes.
 2013-05-19 12:42:52 +02:00
Łukasz Langa
e80636b668 Added TransRealMixin to fix i18n global state pollution in the test suite 2013-05-19 12:05:57 +02:00
Senko Rasic
c44a2c40fe Fixed #18990 -- Loaddata now complains if fixture doesn't exist 
If the fixture doesn't exist, loaddata will output a warning.

The fixture named "initial_data" is exceptional though; if it
doesn't exist, the warning is not emitted. This allows syncdb and
flush management commands to attempt to load it without causing
spurious warnings.

Thanks to Derega, ptone, dirigeant and d1ffuz0r for contributions
to the ticket.
 2013-05-19 11:31:27 +02:00
Senko Rasic
cc3b3ba93a Fixed #18990: Loaddata now complains if fixture doesn't exist 
The fixture named "initial_data" is exceptional though; if it
doesn't exist, the error is not raised. This allows syncdb and
flush management commands to attempt to load it without causing
an error if it doesn't exist.
 2013-05-19 10:56:09 +02:00
Andrea Crotti
5124ab7620 add comment to explain why it's necessary to do an explicit check for 
Python2 and how metaclasses are defined
 2013-05-19 10:36:04 +02:00
Marc Tamlyn
c70ca4879e Merge pull request #1116 from elektrrrus/ticket_20234_20236 
Ticket 20234 20236
 2013-05-19 01:32:41 -07:00
Emil Stenström
7d77e9786a Fixed #20246 -- Added non-breaking spaces between values an units 2013-05-18 23:01:48 +02:00
Tome Cvitan
caf56ad174 Fixed #20440 -- Ensured CharField's max_length/min_length are integers 2013-05-18 22:30:24 +02:00
Karol Sikora
3eba8c7f7f Fixed #20234 and #20236 -- SingleObjectMixin fixes 
Added object on SingleObjectMixin returned context,
some code clanup.
 2013-05-18 21:13:27 +02:00
Aymeric Augustin
0038296135 Fixed ff881aef on Python 3. 2013-05-18 20:48:47 +02:00
Shai Berger
ff881aef53 Fixed #13958 -- problem reporting exception from \r-line-ended file 
Thanks petrvanblokland for reporting and saz for the patch
 2013-05-18 19:30:03 +03:00
Łukasz Langa
f763227c7d Fixes a Python 3.x regression introduced in a19e9d80 2013-05-18 18:06:31 +02:00
Florian Apolloner
dc8814bf7d Merge branch 'master' of github.com:django/django 2013-05-18 17:39:14 +02:00
Łukasz Langa
bd97f7d0cb Fixed #15201: Marked CACHE_MIDDLEWARE_ANONYMOUS_ONLY as deprecated 2013-05-18 17:38:32 +02:00
Florian Apolloner
acd0bb39df Fixed #14894 -- Ensure that activating a translation doesn't run into threading issues. 
Thanks to maxbublis for the report and sergeykolosov for the patch.
 2013-05-18 17:36:31 +02:00
Donald Stufft
398841d6d3 Merge branch 'allow-any-iterable-for-choices' 2013-05-18 11:31:16 -04:00
Donald Stufft
a19e9d80ff Fixed #20430 - Enable iterable of iterables for model choices 
Allows for any iterable, not just lists or tuples, to be used as
the inner item for a list of choices in a model.
 2013-05-18 11:14:05 -04:00
Aymeric Augustin
e73cb6391d Merge pull request #1122 from ambv/issue13285 
Fixed #13285: populate_xheaders breaks caching
 2013-05-18 08:05:48 -07:00
Łukasz Langa
64e11a68f1 Fixed #13285: populate_xheaders breaks caching 2013-05-18 17:03:43 +02:00
Aymeric Augustin
3634948c88 Moved IgnorePendingDeprecationWarningsMixin in django.test.utils. 
This mixin is useful whenever deprecating a large part of Django.
 2013-05-18 16:49:15 +02:00
Olivier Sels
63a9555d57 Fixed #19436 -- Don't log warnings in ensure_csrf_cookie. 2013-05-18 16:17:46 +02:00
Aymeric Augustin
7d050e8e9c Merge pull request #1113 from denibertovic/master 
Fixed #18761 -- Added whitespace stripping to URLField and SlugField.
 2013-05-18 07:11:11 -07:00
Deni Bertovic
186ec21a3d Added stripping of whitespace for SlugField and URLField 2013-05-18 16:06:08 +02:00
Jacob Burch
89955cc35f Fixed #9595 -- Allow non-expiring cache timeouts. 
Also, streamline the use of 0 and None between cache backends.
 2013-05-18 15:39:42 +02:00
Łukasz Langa
92ebb29c53 Fixes #19919: get_language_from_request() disregards "en-us" and "en" languages 
when matching Accept-Language
 2013-05-18 14:37:04 +02:00
Florian Apolloner
16683f29ea Merge pull request #1084 from erikr/master 
Fixed #13546 -- Easier handling of localize field options in ModelForm
 2013-05-18 05:15:15 -07:00
Marc Tamlyn
ef73a8eefd Merge pull request #1083 from Markush2010/ticket20235 
Fixes #20235 - MultipleObjectMixin requires object_list in kwargs
 2013-05-18 05:14:28 -07:00
Erik Romijn
756b81dbd1 Fixed #13546 -- Easier handling of localize field options in ModelForm 2013-05-18 14:13:00 +02:00
Matthew Somerville
1c921cfac3 Fixed #20235 -- Use self.object_list if object_list not present in get_context_data kwargs. 
This is so MultipleObjectMixin can be used in the same way as
SingleObjectMixin.
 2013-05-18 14:10:40 +02:00
Senko Rasic
493aca453a Fixed #11160 - Ensure full_clean is called from non_form_errors 
Updated FormSet.non_form_errors() to ensure full_clean() has
been called before returning the errors.
 2013-05-18 13:44:27 +02:00
Aymeric Augustin
4bed64c417 Made test introduced in 566e284c pass on Python 3. 2013-05-18 13:34:52 +02:00
Senko Rasic
566e284c56 Added test for multipart, non form-data POST. 
Closes #9054. The bug itself is no longer present.
 2013-05-18 12:50:28 +02:00
Claude Paroz
8fd44b2551 Fixed #20356 -- Prevented crash when HTTP_REFERER contains non-ascii 
Thanks srusskih for the report and Aymeric Augustin for the review.
 2013-05-18 12:39:11 +02:00
Florian Apolloner
051cb1f4c6 Fixed #20411 -- Don't let invalid referers blow up CSRF same origin checks. 
Thanks to edevil for the report and saz for the patch.
 2013-05-18 12:32:47 +02:00