Tim Graham
4ba373840a
Fixed #16534 -- Improved ability to customize DiscoverRunner
...
Added DiscoverRunner.test_suite and .test_runner attributes.
Thanks tomchristie for the suggestion and jcd for the patch.
2013-09-10 09:49:39 -04:00
Roberto Aguilar
af67ce5e18
Fixed #4574 -- Added CSS classes to the admin calendar widget for better control over styling.
2013-09-10 08:07:17 -05:00
Tim Graham
2bc5143866
Fixed #7467 -- Added a template block to override the admin welcome message.
...
Thanks Jeff Kowalczyk for the suggestion and rctay for the patch.
2013-09-10 08:48:03 -04:00
John Hensley
30fc49a7ca
Fixed #21057 -- Prevented FileSystemStorage from leaving temporary files.
2013-09-10 08:33:53 -04:00
e0ne
f2a4452882
Fixed #18403 -- Initialized bad_cookies in SimpleCookie
...
Thanks Stefano Crosta for the report.
2013-09-10 08:26:54 -04:00
homm
7008ed61c5
Fixed #21033 -- Fixed uploaded filenames not always being truncated to 255 characters
2013-09-10 01:55:16 +02:00
Aymeric Augustin
d9413d33b2
Refactored code and tests that relied on django.utils.tzinfo.
...
Refs #17262 .
2013-09-09 22:32:52 +02:00
Aymeric Augustin
ec2778b445
Fixed #17262 -- Refactored tzinfo implementations.
...
This commit deprecates django.utils.tzinfo in favor of the more recent
django.utils.timezone which was introduced when Django gained support
for time zones.
2013-09-09 22:32:51 +02:00
Kevin Christopher Henry
9d700322b3
Fixed #19885 -- cleaned up the django.test namespace
...
* override_settings may now be imported from django.test
* removed Approximate from django.test
* updated documentation for things importable from django.test
Thanks akaariai for the suggestion.
2013-09-09 16:03:13 -04:00
Josh Mize
a52cc1c088
Fixed #21078 -- Handled additional bad Accept-Language header
2013-09-09 15:19:09 -04:00
Keryn Knight
0d74f9553c
Fixed #21063 -- AdminSite app_index should be fail early if the user has no permissions.
2013-09-09 12:51:03 -04:00
Садовский Николай
1185370c2c
Fixed #20707 -- Added explicit quota assignment to Oracle test user
...
To enable testing on Oracle 12c
2013-09-09 16:25:13 +03:00
Curtis Maloney
7c6f2ddcd9
Simplify FilterExpression.args_check
2013-09-09 09:03:50 -04:00
Daniel Boeve
6dca603abb
Fixed #20889 -- Prevented email.Header from inserting newlines
...
Passed large maxlinelen to email.Header to prevent newlines from being
inserted into value returned by _convert_to_charset
Thanks mjl at laubach.at for the report.
2013-09-09 08:47:41 -04:00
Baptiste Mispelon
28a571348b
Fix #20745 : Don't silence TypeError raised inside templates.
...
Thanks to robin for the report and claudep for the review.
2013-09-08 22:05:35 +02:00
Alex Gaynor
9d11522599
Removed some more unused local vars
2013-09-08 12:20:01 -07:00
Alex Gaynor
96fd5557f9
Removed a ton of unused local vars
2013-09-08 08:05:16 -07:00
Alex Gaynor
0ee8aa5c39
Removed an unused local var
2013-09-08 07:42:16 -07:00
Aymeric Augustin
ded11aa620
Fixed #18766 -- Pointed to pytz when LocalTimezone fails.
...
Thanks void for the report.
2013-09-08 02:04:43 -05:00
Pablo Mouzo
b11564fd36
Fixed #16869 -- BaseGenericInlineFormSet.save_new should use form's save() method
...
Thanks mattaustin for the report and Pablo Recio (pyriku) for the patch.
2013-09-07 20:00:38 -04:00
Juan Catalano
04415bf81b
Fixed #21013 -- Ensure that ModelAdmin.get_queryset is considered for the admin history view.
2013-09-07 14:53:29 -05:00
Aymeric Augustin
31e16c1343
Negligible style fix.
2013-09-07 13:48:37 -05:00
Alex Gaynor
907f19eba7
Merge pull request #1565 from garrypolley/#19988-ordinal-html-i18n-fix
...
fixes #19988 , allow html in ordinal for humanize
2013-09-07 11:13:55 -07:00
Julien Phalip
55a11683f7
Fixed #20836 -- Ensure that the ForeignKey's to_field attribute is properly considered by the admin's interface when creating related objects.
...
Many thanks to Collin Anderson for the report and patch and to Peter Sheats for the test.
2013-09-07 12:14:07 -05:00
Aymeric Augustin
476b07641c
Oops :(
2013-09-07 11:32:39 -05:00
Aymeric Augustin
7bb6279360
Fixed an encoding issue in the test client.
...
Fixed
comment_tests.tests.test_comment_view.CommentViewTests.testCommentPostRedirectWithInvalidIntegerPK.
Refs #20530 .
2013-09-07 11:31:08 -05:00
Andrew Godwin
bacbbb481d
RunSQL migration operation and alpha SeparateDatabaseAndState op'n.
2013-09-07 11:03:38 -05:00
Pablo Mouzo
73de9dd1fa
Add `response_delete` and `render_delete_form` methods to `ModelAdmin`
...
This make it easier to control the delete flow.
2013-09-07 10:59:49 -05:00
Aymeric Augustin
8aaca651cf
Fixed #20557 -- Properly decoded non-ASCII cookies on Python 3.
...
Thanks mitsuhiko for the report.
Non-ASCII values are supported. Non-ASCII keys still aren't, because the
current parser mangles them. That's another bug.
2013-09-07 10:25:43 -05:00
Aymeric Augustin
ae7f9afaf6
Minor cleanup in the WSGI handler.
2013-09-07 10:25:16 -05:00
Aymeric Augustin
4e88d106dc
Refactored the unmangling of the WSGI environ.
2013-09-07 10:03:50 -05:00
Aymeric Augustin
636860fbfb
Moved two WSGI-specific functions to the WSGI handler.
...
They were defined in base when the mod_python handler used them. See bfcecbff
.
2013-09-07 10:03:49 -05:00
Loic Bistuer
ec47de77d6
Fixed regression introduced by a962286
, changed ugettext to ugettext_lazy.
2013-09-07 08:09:13 -04:00
Alex Gaynor
2530735d2d
Fixed a number of flake8 errors -- particularly around unused imports and local variables
2013-09-06 21:56:40 -07:00
Loic Bistuer
37d46b20fc
Fixed regression introduced by efd1e60
, 'map' returns an iterator on PY3.
2013-09-07 08:00:11 +07:00
Eric Boersma
ded40142a9
Fixed #20007 -- Configured psycopg2 to return UnicodeArrays
...
Thanks hogbait for the report.
2013-09-06 20:43:58 -04:00
Russell Keith-Magee
926bc421d9
Merge pull request #1566 from adamsc64/ticket_11857
...
Fixed #11857 -- Added missing 'closed' property on TemporaryFile class.
2013-09-06 17:38:37 -07:00
Loic Bistuer
adc0ab3386
Fixed #21037 -- Made MigrationWriter raise a ValueError when serializing lambda functions.
2013-09-06 20:13:01 -04:00
Tim Graham
498014ccd5
Fixed Python 3 syntax error introduced in [ c72392da
]
2013-09-06 20:07:57 -04:00
Russell Keith-Magee
4f5faa1916
Merge pull request #1582 from rca/12756-missing-yaml-module-serializer-error-message
...
Fixed #12756 : Improved error message when yaml module is missing.
2013-09-06 16:05:02 -07:00
Roberto Aguilar
01a5359477
Cleanup commit after peer review.
2013-09-06 22:45:31 +00:00
Russell Keith-Magee
9b2dc12b83
Merge pull request #1580 from ianawilson/ticket_16502
...
Fixed #16502 -- Fixed a TemplateDoesNotExist error that should be an ImproperlyConfigured.
Assistance on the patch from #jambronrose.
2013-09-06 15:31:25 -07:00
Aymeric Augustin
b4cd8169de
Fixed #11811 -- Data-loss bug in queryset.update.
...
It's now forbidden to call queryset.update(field=instance) when instance
hasn't been saved to the database ie. instance.pk is None.
2013-09-06 17:15:23 -05:00
Aymeric Augustin
73f38eb4d1
Minor factorization.
2013-09-06 17:15:23 -05:00
Russell Keith-Magee
122020fdb9
Merge pull request #1579 from ianawilson/ticket_21058
...
Fixed #21058 -- Fixed debug view blowing up when no template is provided to the template rendering functions.
Assistance on this commit from @jambonrose.
2013-09-06 15:06:57 -07:00
Adrian Holovaty
e844e10b4f
Moved a settings usage up the stack in utils/formats.py #unsettings
2013-09-06 17:01:36 -05:00
Andrew Godwin
0b7cf56e28
Add -l alias for migrate --list
2013-09-06 17:00:38 -05:00
Ian Wilson
b79df0b358
adds fix for SingleObjectTemplateResponseMixin raising a TemplateDoesNotExist when it should have raised an ImproperlyConfigured. fixes 16502. by @ianawilson, @jambonrose
2013-09-06 16:27:34 -05:00
Julien Phalip
d5df914fe1
Merge pull request #1578 from rmutter/ticket_20821
...
Fixed #20821 -- Added tooltips to Admin SelectBox widget
2013-09-06 14:03:58 -07:00
Ian Wilson
9b7f4aab32
adds fix and test for when a template is not specified at all to render(). fixes #21058 . by jambonrose and ianawilson
2013-09-06 15:50:18 -05:00
Rudy Mutter
c438cc2a36
Fixed #20821 -- Added tooltips to Admin SelectBox widget
...
The Admin widget, which can be used to filter multiple selects
can sometimes be too narrow and hide information such as
user permissions. This commit adds tooltips to the select
options so that a user can hover over and see the hidden text.
2013-09-06 15:46:38 -05:00
Andrew Godwin
ce5e09353d
Merge pull request #1575 from mburst/ticket_21049
...
Fixed #21049 -- Fixed autoreload for Python 3
2013-09-06 13:37:11 -07:00
Roberto Aguilar
076cf131ec
Moved get_serializer() call in dumpdata command.
...
Moved the get_serializer() call within the condition that checks public
serializers. This will allow exceptions other than
SerializerDoesNotExist to be raised in order to provide the caller with
useful information, e.g when pyyaml is not installed.
2013-09-06 20:33:23 +00:00
Roberto Aguilar
c72392dab4
Added yaml directly into BUILTIN_SERIALIZERS.
...
The serializer definitely exists, but the dependent yaml module may not
be installed. The register_serializer() function will catch exceptions
and will stub in a fake serializer object that will raise the exception
when the serializer is used.
2013-09-06 20:33:23 +00:00
Andrew Godwin
efd1e6096e
Adding 'sqlmigrate' command and quote_parameter to support it.
2013-09-06 15:28:12 -05:00
Dan Johnson
df462cf760
Fixed #21043 -- Made resolve() handle reverse_lazy objects.
...
Thanks Keryn Knight for the report.
2013-09-06 15:46:43 -04:00
Max Burstein
559cb826b8
Fixed #21049 -- Fixed autoreload for Python 3
...
Changed th system module values check to return a list.
In Python 3 it returns a dict_view which could occassionally produce
a runtime error of "dictionary changed size during iteration".
2013-09-06 14:37:43 -05:00
Florian Apolloner
85359ec9a4
Merge branch 't20812'
2013-09-06 21:03:46 +02:00
Daniel Langer
cc957cb16c
Fixed #4287 -- Fixed NaN and +/- Infinity handling in FloatField
...
NaN, +Inf, and -Inf are no longer valid values for FloatFields.
2013-09-06 14:56:37 -04:00
Christopher Adams
b2f5ac1656
Fixed #11857 -- Added missing 'closed' property on TemporaryFile class.
...
- TemporaryFile now minimally mocks the API of the Python standard
library class tempfile.NamedTemporaryFile to avoid AttributeError
exceptions.
- The symbol django.core.files.NamedTemporaryFile is actually assigned
as a different class on different operating systems.
- The bug only occurred if Django is running on Windows, hence why it
was hard to diagnose.
2013-09-06 14:32:46 -04:00
Garry Polley
337bd248a5
fixes #19988 , allow html in ordinal for humanize
2013-09-06 12:59:44 -05:00
Andrew Godwin
05e14e8eaf
Migration autodetector now corerctly deals with proxy models
2013-09-06 12:39:46 -05:00
Adrian Holovaty
a962286b74
Added AdminSite attributes for easily changing admin title.
...
AdminSite now has overridable site_header, site_title and index_title attributes. Changed
each admin view to pass these to the context (in a new AdminSite.each_context() method).
The intent here is to make it easier to override these things in the common case, instead of
having to override a template, which is a bigger burden.
2013-09-06 12:31:50 -05:00
Adrian Holovaty
273a1e6b8d
Fixed awkward indentation in admin URLconfs
2013-09-06 12:31:50 -05:00
Florian Apolloner
2326dedde8
Fixed #20812 -- Error out if __unicode__/__str__ doesn't return a text type.
2013-09-06 19:24:18 +02:00
Andrew Godwin
cdeff3acc2
Project/ModelState now correctly serialize multi-model inheritance
2013-09-06 12:16:03 -05:00
Chris Wilson
eade315da1
Fixed #10164 -- Made AutoField increase monotonically on SQLite
...
Thanks malte for the report.
2013-09-06 12:31:17 -04:00
Andrew Godwin
630eb0564a
Fix SchemaEditor.__exit__ to handle exceptions correctly
2013-09-06 11:09:16 -05:00
Andrew Godwin
9f6e6009a4
Add --list option to migrate command
2013-09-06 11:06:19 -05:00
Andrew Godwin
32838a5beb
Make db.migrations ignore South-style migrations.
2013-09-06 10:35:53 -05:00
Aymeric Augustin
b80be68e08
Fixed #21052 -- Small performance optimization.
2013-09-06 10:34:32 -05:00
Aymeric Augustin
e492ab8e7e
Fixed #18719 -- Made force_bytes more consistent with force_text.
2013-09-06 10:28:28 -05:00
Markus Holtermann
bd8e1a354c
Fixed #20977 -- Fixed writing migrations to disk on Python 3
2013-09-06 09:51:58 -04:00
Preston Timmons
8625c7aab3
Fixed #16096 -- Added origin attribute to template instances.
...
Thanks jdunck for the suggestion.
2013-09-06 09:14:52 -04:00
Loic Bistuer
e1266e50b2
Fixed #21015 -- Fixed MigrationLoader when importlib.import_module returns a file module or an empty directory.
2013-09-06 08:30:19 -04:00
Loic Bistuer
82bbb9fe81
Fixed #21014 -- Fixed gobbled ImportError in MigrationLoader.
2013-09-06 08:30:18 -04:00
Eric Boersma
4d13cc56de
Fixed #21035 -- Changed docs to treat the acronym SQL phonetically.
...
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.
2013-09-05 20:14:58 -04:00
Aymeric Augustin
6a6428a36f
Took advantage of django.utils.six.moves.urllib.*.
2013-09-05 14:39:23 -05:00
CHI Cheng
ed9cd4fd8b
Fixed #21000 -- Made cached_db session backend respect SESSION_CACHE_ALIAS
2013-09-05 10:47:58 -04:00
ersran9
a2374bcf47
Fixed #20918 -- Tidied up implementation of custom assertions
...
1. Moved common logic between assertContains and assertNotContains
into a separate function _assert_contains()
2. Moved common logic between assertTemplateUsed and
assertTemplateNotUsed into a separate function
_assert_templateused()
Thanks Marc Tamlyn for the report and review.
2013-09-05 09:51:23 -04:00
Aymeric Augustin
4170b9f402
Tested exc_type instead of exc_value in __exit__.
...
exc_value might be None even though there's an exception, at least on
Python 2.6. Thanks Thomas Chaumeny for the report.
Fixed #21034 .
Forward-port of a8624b2
from 1.6.x.
2013-09-04 16:19:04 -05:00
Aymeric Augustin
7b623247e8
Updated six to version 1.4.1.
2013-09-04 15:21:24 -05:00
Loic Bistuer
34d52fd32e
Fixed #21010 -- Changed ModelState to only copy _meta.local_fields.
2013-09-04 14:05:59 -04:00
Tim Graham
5649c0af9d
Fixed "indentation is not a multiple of four" pep8 issues.
2013-09-03 14:22:21 -04:00
Carl Meyer
8f7f8bf688
Fixed #21026 -- Corrected help for manage.py test command.
2013-09-03 09:50:34 -06:00
Claude Paroz
dd656073ad
Fixed #21003 -- Ensured geometry widget return value has SRID
...
Thanks Mathieu Leplatre for the report and initial patch.
2013-09-03 13:53:35 +02:00
Claude Paroz
3550b27a89
Isolated map creation JS code
2013-09-03 13:53:35 +02:00
Claude Paroz
b6889c68d7
Prevented rendering attrs to be squashed in OSMWidget
2013-09-03 10:02:55 +02:00
Claude Paroz
6ecbac21a9
Fixed syntax error in OSMWidget
2013-09-03 09:05:01 +02:00
Claude Paroz
973502c047
Fixed gis test to run on non gis-enabled settings
...
Refs #20998 .
2013-09-02 14:15:04 +02:00
Claude Paroz
102f26c929
Fixed #20998 -- Allow custom (de)serialization for GIS widgets
...
Thanks Mathieu Leplatre for the report and the initial patch.
2013-09-02 13:32:00 +02:00
Aymeric Augustin
868b4c921c
Used six.moves.zip_longest, new in six 1.4.0.
2013-09-02 12:11:16 +02:00
Aymeric Augustin
365c3e8b73
Replaced "not PY3" by "PY2", new in six 1.4.0.
2013-09-02 12:11:02 +02:00
Aymeric Augustin
4292097078
Updated the bundled version of six to 1.4.0.
2013-09-02 12:07:03 +02:00
Ramiro Morales
17d898dedd
Remove usage of deprecated module_name model option introduced in 1c0c879be3
.
2013-09-01 09:58:33 -03:00
Loic Bistuer
ff9e116198
Fixed #21008 -- Made MigrationWriter handle Promise objects.
2013-08-31 20:26:44 -04:00
Claude Paroz
1c0c879be3
Fixed #17074 -- Improved first field detection in admin add form
...
Thanks Kidwind for the report and Julien Phalip for the initial
patch.
2013-08-31 21:19:22 +02:00
Ramiro Morales
92a710cd03
Updated Selenium-based tests after e909ceae9b
.
2013-08-31 12:14:52 -03:00
Ramiro Morales
e909ceae9b
Made django.test.testcases not depend on staticfiles contrib app.
...
Do this by introducing a django.contrib.staticfiles.testing.StaticLiveServerCase
unittest TestCase subclass.
Fixes #20739 .
2013-08-31 11:02:32 -03:00
Claude Paroz
3e34005b1b
Fixed #13182 -- Prevented trailing spaces in indented json output
...
Thanks Stéphane Raimbault for the report and the initial patch.
2013-08-31 15:18:01 +02:00
Carl Meyer
7211741fc5
Fixed #20999 - Allow overriding formfield class with choices, without subclass restrictions.
...
Refs #18162 . Thanks claudep and mjtamlyn for review.
2013-08-30 17:43:10 -06:00
Simon Charette
11cd7388f7
Fixed #20989 -- Removed useless explicit list comprehensions.
2013-08-30 10:57:51 -04:00
Claude Paroz
e4a67fd906
Set 'bidi' Urdu property to True
...
Refs #20454 .
2013-08-30 12:03:39 +02:00
Curtis Maloney
e2f06226ea
Improved {% include %} implementation
...
Merged BaseIncludeNode, ConstantIncludeNode and Include node.
This avoids raising TemplateDoesNotExist at parsing time, allows recursion
when passing a literal template name, and should make TEMPLATE_DEBUG behavior
consistant.
Thanks loic84 for help with the tests.
Fixed #3544 , fixed #12064 , fixed #16147
2013-08-30 10:36:36 +03:00
Anssi Kääriäinen
e973ee6a98
Fixed #20988 -- Added model meta option select_on_save
...
The option can be used to force pre 1.6 style SELECT on save behaviour.
This is needed in case the database returns zero updated rows even if
there is a matching row in the DB. One such case is PostgreSQL update
trigger that returns NULL.
Reviewed by Tim Graham.
Refs #16649
2013-08-30 09:41:07 +03:00
Anssi Kääriäinen
13be3bfef1
Removed stale add_q() comment
2013-08-30 09:45:32 +03:00
Tomer Chachamu
50d25a9c5a
Added SplitHiddenDateTimeWidget to django.forms.widgets.__all__
2013-08-29 14:22:04 -04:00
Tim Graham
c7d0ff0cad
Fixed #20989 -- Removed explicit list comprehension inside dict() and tuple()
...
Thanks jeroen.pulles at redslider.net for the suggestion and
helper script.
2013-08-29 12:11:03 -04:00
Tim Graham
f19a3669b8
Fixed #14786 -- Fixed get_db_prep_lookup calling get_prep_value twice if prepared is False.
...
Thanks homm for the report and Aramgutang and lrekucki for work on
the patch.
2013-08-29 11:13:34 -04:00
Tim Graham
af953c45cc
Fixed #16433 -- Fixed a help_text/read only field interaction that caused an admin crash.
...
Thanks chris at cogdon.org for the report and admackin for the patch.
2013-08-29 09:39:31 -04:00
Tim Graham
cf8d6e9108
Fixed #20881 -- Removed contrib.auth.models.AbstractUser.get_absolute_url()
...
The definition is arbitrary and creates a broken "view on site"
link in the admin if a project doesn't define such a URL.
2013-08-29 06:36:35 -04:00
Curtis Maloney
8d473b2c54
Fixed #7116 -- Optimize RequestContext construction
2013-08-29 10:25:56 +03:00
Curtis Maloney
5cdacbda03
Fixed #17356 -- Allowed {% include %} to render compiled templates
...
Reviewed by Loic Bistuer and Tim Graham.
2013-08-29 10:22:24 +03:00
Claude Paroz
169637649b
Fixed #20984 -- Stopped decoding bytes in sqlite3 adapter on Python 3
...
Thanks lvella at gmail.com for the report.
2013-08-29 08:39:06 +02:00
Tim Graham
12023887ea
Fixed #14765 -- Removed unncessary usage of NodeList in ForNode.
...
Thanks traff and FunkyBob for work on the patch.
2013-08-28 09:48:47 -04:00
Loic Bistuer
da800be6dd
Fixed #20986 -- Enabled SelectDateWidget to use custom months
...
Reviewed by Trac alias MarkusH.
2013-08-28 16:39:26 +03:00
Michał Górny
b89c2a5d9e
Fixed #18171 -- Checked signature of authenticate() to avoid supressing TypeErrors.
...
The current auth backend code catches TypeError to detect backends that
do not support specified argumetnts. As a result, any TypeErrors raised
within the actual backend code are silenced.
In Python 2.7+ and 3.2+ this can be avoided by using inspect.getcallargs().
With this method, we can test whether arguments match the signature without
actually calling the function.
Thanks David Eyk for the report.
2013-08-28 07:51:45 -04:00
Warren Smith
dd3a883894
Fixed #20693 -- Add timezone support to built-in time filter.
...
Modified django.utils.dateformat module, moving __init__() method and
timezone-related format methods from DateFormat class to TimeFormat
base class. Modified timezone-related format methods to return an
empty string when timezone is inappropriate for input value.
2013-08-26 16:15:53 -05:00
Erik Romijn
fa57266699
Fixed #20972 -- Make messages cookie follow session cookie secure/httponly
2013-08-26 21:34:29 +02:00
Ramiro Morales
b785a80d19
Added further fixes, tests for #19949/f33db5a09a.
...
Thanks Susan Tan. Refs #19949 .
2013-08-26 08:47:24 -03:00
Christopher Medrela
32a962bdbf
Fixed #20814 -- Improved model field accessor clash error messages
...
Thanks shai for the suggestion.
2013-08-24 18:00:23 -04:00
Claude Paroz
f4e9804567
Fixed #20961 -- Fixed HttpResponse default empty content
...
Thanks epandurski at gmail.com for the report.
2013-08-24 18:10:12 +02:00
SusanTan
f33db5a09a
Fixed 19949 -- Cached template loader now caches TemplateDoesNotExist
...
Thanks @timgraham and @jdunck for the code reviews and Kronuz for bug
report and initial patch.
2013-08-24 09:19:55 -04:00
Andrew Godwin
35230adf63
Python 3 compat fix for callable()
2013-08-23 17:59:35 +01:00
Andrew Godwin
2787de652a
Fix location of tablespace clauses in schema backend column SQL
2013-08-23 14:38:55 +01:00
Andrew Godwin
5569b0b92f
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/db/backends/oracle/base.py
django/db/backends/postgresql_psycopg2/base.py
django/db/models/signals.py
tests/queries/tests.py
2013-08-23 12:36:53 +01:00
Andrew Godwin
9cc6cfc405
Fix Oracle's default handling and schema-prepared-statement issue
2013-08-23 12:07:55 +01:00
Tim Graham
b0ce6fe656
Fixed #20922 -- Allowed customizing the serializer used by contrib.sessions
...
Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.
Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews.
2013-08-22 13:58:26 -04:00
Lukasz Balcerzak
9d1987d767
Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices
2013-08-22 11:50:52 -04:00
Rainer Koirikivi
65cf82bd08
Fixed #20934 -- Avoided NoReverseMatch in ModelAdmin.changelist_view
...
The view tried to display links to a ModelAdmin's change_view, which
resulted in NoReverseMatches if get_urls was overridden to remove the
corresponding url.
2013-08-22 10:08:54 -04:00
Anssi Kääriäinen
6af05e7a0f
Fixed model.__eq__ and __hash__ for no pk value cases
...
The __eq__ method now considers two instances without primary key value
equal only when they have same id(). The __hash__ method raises
TypeError for no primary key case.
Fixed #18864 , fixed #18250
Thanks to Tim Graham for docs review.
2013-08-22 17:24:07 +03:00
Tim Graham
768bbf3efe
Revert "Fixed #20956 -- Removed useless check in django.db.utils"
...
This reverts commit ce0e86cf76
.
The check is necessary if 'ENGINE' is an empty string.
Thanks apollo13 for pointing this out.
2013-08-22 09:47:17 -04:00
Dima Kurguzov
ce0e86cf76
Fixed #20956 -- Removed useless check in django.db.utils
2013-08-22 08:53:14 -04:00
Claude Paroz
8cd8742981
Moved translator comment just above the target string
2013-08-22 09:52:54 +02:00
Anssi Kääriäinen
8d65b6082c
Fixed #20955 -- select_related regression
...
In cases where the same connection (from model A to model B along the
same field) was needed multiple times in a select_related query, the
join setup code mistakenly reused an existing join.
2013-08-22 10:51:07 +03:00
Andrew Godwin
beefac8aae
Only create the migration directory once per app
2013-08-21 22:32:05 +01:00
Tim Graham
2d903929a7
Fixed #20949 -- Typo #2 in docstring
2013-08-21 22:32:05 +01:00
Tim Graham
cb5c0bec14
Fixed docstring typo, thanks minddust.
2013-08-21 22:32:04 +01:00
Tim Graham
3f416f6379
Fixed a regression with get_or_create and virtual fields.
...
refs #20429
Thanks Simon Charette for the report and review.
2013-08-21 22:32:04 +01:00
Ramiro Morales
8e571e5f8f
Fixed #12422 -- Don't override global email charset behavior for utf-8.
...
Thanks simonb for the report, Claude Paroz and Susan Tan for their work
on a fix.
2013-08-21 22:32:04 +01:00
Anssi Kääriäinen
244e2b71f5
Fixed #20946 -- model inheritance + m2m failure
...
Cleaned up the internal implementation of m2m fields by removing
related.py _get_fk_val(). The _get_fk_val() was doing the wrong thing
if asked for the foreign key value on foreign key to parent model's
primary key when child model had different primary key field.
2013-08-21 22:32:04 +01:00
Ramiro Morales
c5fbd16362
Import test case classes from their public API module.
2013-08-21 22:32:04 +01:00
Ramiro Morales
01223840f3
Fixed #18967 -- Don't base64-encode message/rfc822 attachments.
...
Thanks Michael Farrell for the report and his work on the fix.
2013-08-21 22:32:04 +01:00
Florian Apolloner
839940f27f
Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.
2013-08-21 22:32:04 +01:00
Simon Charette
1db5fce1ee
Oracle also treats NULLs as largests values when ordering.
2013-08-21 22:32:03 +01:00
Anssi Kääriäinen
f5552571dc
Fixed #20820 -- Model inheritance + m2m fixture loading regression
...
Tests by Tim Graham, report from jeroen.pulles@redslider.net .
2013-08-21 22:31:50 +01:00
Anssi Kääriäinen
ced3e6b17d
Fixed test failure caused by different NULL ordering between backends
2013-08-21 22:31:50 +01:00
Anssi Kääriäinen
cea7204504
Fixed #14056 -- Made sure LEFT JOIN aren't trimmed in ORDER BY
...
If LEFT JOINs are required for correct results, then trimming the join
can lead to incorrect results. Consider case:
TBL A: ID | TBL B: ID A_ID
1 1 1
2
Now A.order_by('b__a') did use a join to B, and B's a_id column. This
was seen to contain the same value as A's id, and so the join was
trimmed. But this wasn't correct as the join is LEFT JOIN, and for row
A.id = 2 the B.a_id column is NULL.
2013-08-21 22:30:46 +01:00
Simon Charette
63378163f9
Fixed #20943 -- Weakly reference senders when caching their associated receivers
2013-08-21 22:30:45 +01:00
Simon Charette
eadecf0cdb
Avoid importing the deprecated `django.utils.importlib` package.
2013-08-21 22:30:02 +01:00