mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Code Issues 30 Releases Wiki Activity
15,031 Commits 28 Branches 426 Tags 680 MiB
9daf81b94e
Commit Graph

4297 Commits

Author SHA1 Message Date
Andrew Godwin
9daf81b94e Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/db/models/loading.py
 2013-06-19 12:05:23 +01:00
Aymeric Augustin
d9a43545be Merge pull request #1282 from loic/ticket6903 
Fixed failing test on MySQL since c86a9b6
 2013-06-19 03:04:04 -07:00
Loic Bistuer
7d0c3b9b26 Fixed MySQL failing test introduced by c86a9b6 2013-06-19 16:13:43 +07:00
Florian Hahn
2f35c6f10f Fixed #14930 -- values_list() failure on qs ordered by extra column 
Thanks lsaffre for the report and simon29, vicould, and Florian Hahn
for the patch.

Some changes done by committer.
 2013-06-18 23:56:51 +03:00
Aymeric Augustin
9da9b3eb04 Merge pull request #1281 from loic/ticket6903 
Fixed #6903 - Preserved admin changelist filters.
 2013-06-18 13:07:28 -07:00
Loic Bistuer
c86a9b6398 Fixed #6903 - Preserve admin changelist filters after saving or deleting an object 2013-06-19 02:41:36 +07:00
Erik Romijn
aeb1389442 Fixed #20079 -- Improve security of password reset tokens 2013-06-18 20:02:00 +02:00
Baptiste Mispelon
3128f3d38d Fixed #20618 -- Fixed regression in BoundField.label_tag. 2013-06-18 17:49:53 +02:00
Loic Bistuer
ee77d4b253 Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields 2013-06-18 08:01:17 -04:00
Loic Bistuer
f34cfec0fa Refactored ValidationError to allow persisting error params and error codes as the exception bubbles up 2013-06-18 08:01:17 -04:00
Baptiste Mispelon
1b7634a0d0 Fixed #20464 -- Added a total_error_count method on formsets. 
Thanks to frog32 for the report and to Tim Graham for the review.
 2013-06-16 15:49:30 -04:00
Aymeric Augustin
c3df866619 Fixed #20603 -- Made the test suite faster. 
By avoiding to run syncdb with the full set of test models.

Thanks Anssi for the idea.
 2013-06-14 23:16:15 +02:00
Marc Tamlyn
46789e76c6 Fixed #20548 -- Removed all PendingDeprecationWarnings from django test suite 2013-06-14 15:37:39 +01:00
Anssi Kääriäinen
5459795ef2 Fixed #20289 -- pickling of dynamic models 2013-06-14 17:05:54 +03:00
Anssi Kääriäinen
855d1305c5 Added cache to available_apps in cache tests 2013-06-14 17:05:54 +03:00
Anssi Kääriäinen
89bf7a4525 Fixed #20528 -- regression in select_related join promotion 
The join used by select_related was incorrectly INNER when the query
had an ORed filter for nullable join that was trimmed away. Fixed this
by forcing the join type to LOUTER even when a join was trimmed away
in ORed queries.
 2013-06-14 16:29:06 +03:00
Marc Tamlyn
b7bd7087e6 Fixed #15273 -- Extend RedirectView to allow reversal by name. 
Thanks to @DrMeers for the report and @ludwigkraatz for the initial patch.
 2013-06-14 11:59:26 +01:00
Wilfred Hughes
8365ed08b8 Fixed #17076 -- When reversing a URL fails, inform the user which patterns were tried. 2013-06-14 10:26:30 +01:00
Daniel Lindsley
91f317c76d Added a `checksetup` management command for verifying Django compatibility. 2013-06-13 18:39:02 -07:00
Loic Bistuer
9e50833e22 Fixed #20000 -- Allowed ModelForm meta overrides for label, help_text and error_messages 2013-06-13 15:06:25 -04:00
Baptiste Mispelon
dc9c359546 Fixed #20594 -- Add validation to models.SlugField. 
Thanks carbonXT for the report.
 2013-06-13 13:31:57 -04:00
Tim Graham
92c49d6f01 Revert "Fixed #20462 - Fixed sqlite regex lookups for null values and non-string fields." 
This reverts commit 64041f0e6e.

lookup.tests.LookupTests.test_regex_non_string fails under Postgres.
We should also try to rewrite the test using an existing model.
 2013-06-11 17:55:19 -04:00
Axel Haustant
64041f0e6e Fixed #20462 - Fixed sqlite regex lookups for null values and non-string fields. 2013-06-11 14:13:40 -04:00
Gabe Jackson
584bd14dcf Fixed #18134 -- BoundField.label_tag now includes the form's label_suffix 
There was an inconsistency between how the label_tag for forms were
generated depending on which method was used: as_p, as_ul and as_table
contained code to append the label_suffix where as label_tag called on a
form field directly did NOT append the label_suffix. The code for
appending the label_suffix has been moved in to the label_tag code of
the field and the HTML generation code for as_p, as_ul and as_table now
calls this code as well.

This is a backwards incompatible change because users who have added the
label_suffix manually in their templates may now get double label_suffix
characters in their forms.
 2013-06-10 14:23:15 -04:00
Florian Apolloner
af70dfcf31 Reverted the introduction of shared_models. 
The recent improvements should make shared_models obsolete.

This reverts commit 1059da8de6, reversing
changes made to 4fa7f3cdd9.
 2013-06-10 12:34:47 +02:00
Florian Apolloner
f5d4849cbe Revert "Began implementing a shared set of test models to speed up tests." 
This reverts commit 22b7870e40.
 2013-06-10 12:22:40 +02:00
Aymeric Augustin
dfcce4288a Fixed available_apps for selenium tests. 
Refs #20483.
 2013-06-10 12:11:46 +02:00
Aymeric Augustin
c6e6d4eeb7 Defined available_apps in relevant tests. 
Fixed #20483.
 2013-06-10 11:30:01 +02:00
Aymeric Augustin
7a65c95d42 Refactored file_storage tests to avoid depending on servers tests. 2013-06-10 11:16:15 +02:00
Tim Graham
96c71d423d Added runserver validation to detect if DEBUG=False and ALLOWED_HOSTS is empty. 
Refs #19875.
 2013-06-09 15:08:29 -04:00
Andrew Godwin
91c470def5 Auto-naming for migrations and some writer fixes 2013-06-07 17:56:43 +01:00
Andrew Godwin
cd809619a2 Autodetector tests 2013-06-07 15:49:48 +01:00
Andrew Godwin
c7aa4b5338 Field encoding 2013-06-07 15:36:31 +01:00
Andrew Godwin
4492f06408 A bit of an autodetector and a bit of a writer 2013-06-07 15:28:38 +01:00
Andrew Godwin
3c296382b8 Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/db/models/fields/related.py
 2013-06-07 11:15:34 +01:00
Stephen Burrows
e2518fdf46 Fixed #12337 - Honor ModelForm.Meta.exclude when saving ManyToManyFields. 
Thanks margieroginski for the report.
 2013-06-06 10:01:48 -04:00
Claude Paroz
b67f2ac8e6 Fixed #20502 (again) -- More i18n cache flush in tests 
Thanks Timo Graham for noticing the failures.
 2013-06-06 14:28:58 +02:00
Marc Tamlyn
9ed971f4f1 Merge pull request #1245 from oinopion/list_select_related 
Fixed #19080 -- Fine-grained control over select_related in admin
 2013-06-06 01:27:05 -07:00
Anssi Kääriäinen
31fd64ad8a Fixed #20564 -- Generic relations exclude() regression 
The patch for #19385 caused a regression in certain generic relations
.exclude() filters if a subquery was needed. The fix contains a
refactoring to how Query.split_exclude() and Query.trim_start()
interact.

Thanks to Trac alias nferrari for the report.
 2013-06-06 01:54:46 +03:00
Tomek Paczkowski
0fd9f7c95f Fixed #19080 -- Fine-grained control over select_related in admin 2013-06-05 23:08:00 +02:00
Anssi Kääriäinen
8c5b805ca1 PEP 8 cleanup 2013-06-05 21:18:56 +03:00
Bojan Mihelac
b00c6371af Fixed #17927 -- Added initial values support for BaseGenericInlineFormSet 
Thanks Fak3 for the suggestion.
 2013-06-05 07:59:59 -04:00
Tim Graham
a35ed20241 Fixed #18924 -- Made test.Client.logout send user_logged_out signal. 
Thanks awsum for the suggestion and Pavel Ponomarev and
Florian Hahn for the patch.
 2013-06-04 12:39:09 -04:00
Ramiro Morales
e71b63e280 Added i18n-related URL mapper test for a mailing list report. 2013-06-04 11:19:27 -03:00
Aymeric Augustin
51aa000378 Fixed #20485 -- Refactored loaddata for speed. 
Thanks Anssi for reporting this performance bottleneck.
 2013-06-02 20:39:45 +02:00
Tim Graham
61524b09cf Fixed #18388 - Added InlineModelAdmin.get_max_num hook. 
Thanks d.willy.c.c@ for the suggestion and Melevir and Areski Belaid for work
on the patch.
 2013-06-01 18:20:54 -04:00
Tim Graham
fffb55860e Changed assertEquals -> assertEqual. 2013-06-01 06:31:25 -04:00
Claude Paroz
de66b56790 Fixed #18481 -- Wrapped request.FILES read error in UnreadablePostError 
Thanks KyleMac for the report, André Cruz for the initial patch and
Hiroki Kiyohara for the tests.
 2013-06-01 10:26:46 +02:00
Anssi Kääriäinen
369b6fab25 Fixed #18169 -- NoReverseMatch not silenced if from block.super 2013-06-01 00:59:04 +03:00
Anssi Kääriäinen
84909377f2 Fixed #18785 -- Added Test join trimming regression 
The regression was caused by patch to ticket #15316 and was fixed by a
patch to #10790.
 2013-06-01 00:28:44 +03:00