Aymeric Augustin
63b95ca452
[1.6.x] Fixed 9244447c
-- incomplete backport.
...
The test client had been refactored in the mean time. This commit
de-factors the fix. Refs #20530 .
2013-09-07 13:15:13 -05:00
Aymeric Augustin
7fcd6aa669
[1.6.x] Fixed #20530 -- Properly decoded non-ASCII query strings on Python 3.
...
Thanks mitsuhiko for the report.
Backport of 65b6eff3
and adaptation of 8aaca65
from master.
2013-09-07 12:06:38 -05:00
Aymeric Augustin
9244447cc4
[1.6.x] Fixed an encoding issue in the test client.
...
Refs #20530 .
Backport of 7bb62793
and 476b0764
from master.
Conflicts:
django/test/client.py
2013-09-07 12:06:19 -05:00
Aymeric Augustin
fac5735a3d
[1.6.x] 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.
Simplified backport of 8aaca651
and f5add47
from master.
2013-09-07 10:45:24 -05:00
Aymeric Augustin
f855058c35
[1.6.x] 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.
Conflicts:
tests/queries/tests.py
Backport of b4cd8169
from master.
2013-09-06 21:59:28 -05:00
Russell Keith-Magee
2a2ac5c140
Merge pull request #1566 from adamsc64/ticket_11857
...
Fixed #11857 -- Added missing 'closed' property on TemporaryFile class.
Backport of 926bc42
from trunk.
2013-09-06 19:44:25 -05:00
Tim Graham
6ba01f64c1
[1.6.x] Fixed Python 3 syntax error introduced in [ c72392da
]
...
Backport of 498014ccd5
from master
2013-09-06 20:08:56 -04:00
Russell Keith-Magee
3df9647ad9
[1.6.x] Merge pull request #1582 from rca/12756-missing-yaml-module-serializer-error-message
...
Fixed #12756 : Improved error message when yaml module is missing.
Backport of 4f5faa1916
from master.
2013-09-06 19:01:24 -05:00
Russell Keith-Magee
99952bab30
[1.6.x] 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.
Backport of 9b2dc12b83
from master.
2013-09-06 17:39:16 -05:00
Russell Keith-Magee
b917458f47
Merge pull request #1579 from ianawilson/ticket_21058
...
[1.6.x] Fixed #21058 -- Fixed debug view blowing up when no template is provided to the template rendering functions.
Assistance on this commit from @jambonrose.
Backport of 122020fdb9
from master.
2013-09-06 17:11:07 -05:00
Max Burstein
92e89452f1
[1.6.x] 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".
Backport of 559cb826b8
from master
2013-09-06 17:32:08 -04:00
Eric Boersma
180b9955cc
[1.6.x] 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'.
Backport of 4d13cc56de
from master
2013-09-05 20:16:14 -04:00
Aymeric Augustin
a8624b22a7
[1.6.x] 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 .
2013-09-04 16:18:47 -05:00
Aymeric Augustin
7c1efc2fa6
Updated six to version 1.4.1.
2013-09-04 15:23:24 -05:00
Carl Meyer
4420de89b6
[1.6.x] Fixed #21026 -- Corrected help for manage.py test command.
...
Backport of 8f7f8bf688
from master.
2013-09-03 09:51:17 -06:00
Aymeric Augustin
2a14c08e71
Used six.moves.zip_longest, new in six 1.4.0.
2013-09-03 07:34:45 -05:00
Aymeric Augustin
115318051c
[1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.
...
Conflicts:
django/db/backends/oracle/base.py
django/db/backends/sqlite3/base.py
django/db/models/base.py
Backport of 365c3e8b
from master.
2013-09-03 07:34:45 -05:00
Aymeric Augustin
50012577f3
[1.6.x] Updated the bundled version of six to 1.4.0.
...
Backport of 42920970
from master.
2013-09-03 07:34:44 -05:00
Claude Paroz
0514fbb2f3
[1.6.x] Fixed #21003 -- Ensured geometry widget return value has SRID
...
Thanks Mathieu Leplatre for the report and initial patch.
Backport of dd656073ad
from master.
2013-09-03 13:55:20 +02:00
Claude Paroz
bd0319a261
[1.6.x] Isolated map creation JS code
...
Backport of 3550b27a8
from master.
2013-09-03 13:54:50 +02:00
Claude Paroz
b53ce2f31c
[1.6.x] Prevented rendering attrs to be squashed in OSMWidget
...
Backport of b6889c68d7
from master.
2013-09-03 10:04:50 +02:00
Claude Paroz
aa1c175687
[1.6.x] Fixed syntax error in OSMWidget
...
Backport of 6ecbac21a
from master.
2013-09-03 09:08:25 +02:00
Claude Paroz
0c57868908
[1.6.x] Fixed gis test to run on non gis-enabled settings
...
Refs #20998 .
Backport of 973502c0
from master.
2013-09-02 14:31:20 +02:00
Claude Paroz
4e3794dd1f
[1.6.x] Fixed #20998 -- Allow custom (de)serialization for GIS widgets
...
Thanks Mathieu Leplatre for the report and the initial patch.
Backport of 102f26c92
from master.
2013-09-02 13:34:26 +02:00
Carl Meyer
21a3efcf48
[1.6.x] Fixed #20999 - Allow overriding formfield class with choices, without subclass restrictions.
...
Refs #18162 . Thanks claudep and mjtamlyn for review.
Backport of 7211741fc5
from master.
2013-08-30 17:45:14 -06:00
Claude Paroz
1d874ce0f9
[1.6.x] Set 'bidi' Urdu property to True
...
Refs #20454 .
Backport of e4a67fd90
from master.
2013-08-30 12:04:17 +02:00
Anssi Kääriäinen
76e38a2177
[1.6.x] 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
Backport of e973ee6a98
from master
Conflicts:
django/db/models/options.py
tests/basic/tests.py
2013-08-30 09:47:34 +03:00
Anssi Kääriäinen
cd10e998b6
[1.6.x] Removed stale add_q() comment
...
Backport of 13be3bfef1
from master
2013-08-30 09:46:16 +03:00
Tim Graham
10d15f79e5
[1.6.x] 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.
Backport of f19a3669b8
from master
2013-08-29 12:14:40 -04:00
Tim Graham
ef1259342b
[1.6.x] 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.
Backport of af953c45cc
from master
2013-08-29 09:45:02 -04:00
Claude Paroz
58157be5ad
[1.6.x] Fixed #20984 -- Stopped decoding bytes in sqlite3 adapter on Python 3
...
Thanks lvella at gmail.com for the report.
Backport of 169637649
from master.
2013-08-29 08:43:35 +02:00
Claude Paroz
2c08d474a8
[1.6.x] Fixed #20961 -- Fixed HttpResponse default empty content
...
Thanks epandurski at gmail.com for the report.
Backport of f4e980456
from master.
2013-08-24 18:10:50 +02:00
Tim Graham
5f061986b9
[1.6.x] 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.
Backport of b0ce6fe656
from master
2013-08-22 17:55:01 -04:00
Claude Paroz
ff92a6eb5b
[1.6.x] Moved translator comment just above the target string
...
Backport of 8cd874298
from master.
2013-08-22 09:54:35 +02:00
Anssi Kääriäinen
161e26c2ec
[1.6.x] 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.
Backpatch of 8d65b6082c
.
Conflicts:
django/db/models/sql/compiler.py
tests/queries/tests.py
2013-08-22 10:59:59 +03:00
Tim Graham
28b1317fd8
[1.6.x] Fixed #20949 -- Typo #2 in docstring
...
Backport of 0073f1d94f
from master
2013-08-21 10:50:27 -04:00
Tim Graham
b0821e6d3a
[1.6.x] Fixed docstring typo, thanks minddust.
...
Backport of d3ed15b79d
from master
2013-08-21 09:02:19 -04:00
Florian Apolloner
12d364a9b0
[1.6.x] Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.
...
Backport of 6e846f7627
from master.
2013-08-20 21:28:14 +02:00
Anssi Kääriäinen
2b1101a4a6
[1.6.x] Fixed #20820 -- Model inheritance + m2m fixture loading regression
...
Tests by Tim Graham, report from jeroen.pulles@redslider.net .
Backport of 1ed77e7782
from master
2013-08-20 17:15:52 +03:00
Simon Charette
f0bc2865ff
Fixed #20943 -- Weakly reference senders when caching their associated receivers
...
Backport of e55ca60903
from master.
2013-08-20 02:12:50 -04:00
Simon Charette
e7a6eaf5fe
[1.6.x] Correctly format missing Pillow/PIL exceptions messages. refs #19934
...
Backport of b9590a6935
from master.
2013-08-19 18:51:22 -04:00
Harm Geerts
a6ac4f90d0
[1.6.x] Fixed #20829 -- Skip postgis metadata tables with introspection
...
Backport of 24088618
from master.
2013-08-16 21:21:41 +02:00
Claude Paroz
1b48de06c3
[1.6.x] Updated translation templates
2013-08-16 15:13:31 +02:00
Tim Graham
c769c26601
[1.6.x] Revert "Fixed #18491 -- deleting a proxy doesn't show warning about cascade deletes"
...
This reverts commit 2b48fcc607
.
It introduced a regression (#20777 ) which we can't easily fix in 1.6.
2013-08-16 07:59:16 -04:00
Alasdair Nicol
919934602f
[1.6.x] Fixed #20895 -- Made check management command warn if a BooleanField does not have a default value
...
Thanks to Collin Anderson for the suggestion and Tim Graham for
reviewing the patch.
Backport of 22c6497f99
from master
2013-08-15 20:33:02 -04:00
Tim Graham
ccff25b143
[1.6.x] Fixed #17778 -- Prevented class attributes on context from resolving as template variables.
...
Thanks KyleMac for the report, regebro for the patch, and Aymeric for the test.
Backport of 71b5617c24
from master.
2013-08-15 10:22:56 -04:00
Loic Bistuer
39db994790
[1.6.x] Fixed overflow for the "Recent Actions" widget on the admin index.
...
Previously the CSS targeted "li.changelink" and therefore didn't
work for the "add" and "delete" actions.
Refs #14868 .
Backport of 33fc083b0d
from master
2013-08-13 13:26:37 -04:00
Jacob Kaplan-Moss
57dc238d0e
Bumped version numbers for 1.6b2.
2013-08-13 11:12:07 -05:00
Jacob Kaplan-Moss
bfbae15c66
Apply autoescaping to AdminURLFieldWidget.
...
This is a security fix; disclosure to follow shortly.
2013-08-13 11:06:00 -05:00
Jacob Kaplan-Moss
79594b40c0
Fixed is_safe_url() to reject URLs that use a scheme other than HTTP/S.
...
This is a security fix; disclosure to follow shortly.
2013-08-13 11:05:41 -05:00
Collin Anderson
e3e0cf8a0f
[1.6.x] Fixed #20865 -- Fixed raw_id_fields to work with callable limit_choices_to.
...
Backport of d53e574676
from master
2013-08-06 13:44:31 -04:00
Alex Cucu
80b95a2b1f
[1.6.x] Fixed #19918 -- Modified select_for_update to run on the write database.
...
Backport of 1c64a0f29e
from master
2013-08-06 10:58:32 -04:00
Tim Heap
891cdf120a
[1.6.x] Fixed #20850 -- Added MultiWidget.needs_multipart_form
...
Backport of 75c87e2d38
from master
2013-08-05 10:13:48 -04:00
Tim Graham
90bdb42702
[1.6.x] Fixed backport error in previous commit; refs #15961
2013-08-04 07:30:30 -04:00
Loic Bistuer
9053c6da5f
[1.6.x] Moved get_search_results from BaseModelAdmin to ModelAdmin.
...
Refs #15961 .
Backport of 470a9bb22d
from master.
2013-08-04 07:19:13 -04:00
Aymeric Augustin
2eac989985
[1.6.x] Fixed #20822 -- Set content type of default error pages to 'text/html'.
...
Thanks Jimmy Song for the patch.
Backport of 7843775
from master.
2013-08-04 11:04:58 +02:00
Tim Graham
97254154ab
[1.6.x] Fixed #18923 -- Corrected usage of sensitive_post_parameters in contrib.auth
...
Thanks Collin Anderson for the report.
Backport of 425d076d0c
from master
2013-08-02 14:46:51 -04:00
Petr Dlouhý
4e7745cc1c
[1.6.x] Fixed LogEntry.get_admin_url() for non-existent models.
...
Regression introduced by [369b6fa
]; refs #18169 .
Backport of 1b47508ac8
from master
2013-08-02 12:51:46 -04:00
Loic Bistuer
4f8fb19994
[1.6.x] Fixed #18681 -- GenericInlineModelAdmin.get_formset() no longer bypasses get_fieldsets().
...
Refs 23e1b59
which already fixed this issue for ModelAdmin and InlineModelAdmin.
Backport of a0ed2f9260
from master
2013-08-02 10:45:58 -04:00
Harm Geerts
b0bde21884
[1.6.x] Fixed #20838 -- Fixed Geodjango spatialrefsys test failure with postgis-2.0.3
...
Backport of fd0d486467
from master
2013-08-02 10:45:27 -04:00
Claude Paroz
f942554cf3
[1.6.x] Tweaked proj string regex in gis tests
...
Backport of 4367c637d6
from master
2013-08-02 10:45:12 -04:00
Aleksandra Sendecka
6e4fd816c4
[1.6.x] Fixed #18777 -- Localized form fields with as_text/as_hidden
...
Thanks croldan for the report.
Backport of 893d8de6f5
from master
2013-08-02 08:43:19 -04:00
Tim Graham
196cc875b2
[1.6.x] Fixed #17519 -- Fixed missing SQL constraints to proxy models.
...
Thanks thibaultj for the report, jenh for the patch,
and charettes for the tests.
Backport of aa830009de
from master
2013-08-02 08:42:19 -04:00
Tim Graham
b3e54f4a01
[1.6.x] Removed unused model option "admin"
...
Backport of 5df84b268d
from master
2013-08-01 12:33:19 -04:00
Baptiste Mispelon
badca4716f
[1.6.x] Fixed #10491 -- Allowed passing lazy objects to HttpResponseRedirect.
...
Thanks liangent for the report.
Backport of 3c45fb8589
from master
2013-07-30 13:40:18 -04:00
MinRK
bf132bcb8d
[1.6.x] Added support for IPython.start_ipython in shell
...
IPython 1.0 introduces an actual stable public API function
for starting a normal (non-embedded) IPython session.
This is an official public API, which is promised to survive implementation changes.
2013-07-30 10:24:16 -07:00
Aymeric Augustin
88e4a3a3d9
[1.6.x] Fixed a test that could fail depending on PASSWORD_HASHERS.
...
Thanks Claude. Refs #20760 .
Backport of 5b47a9c5a0
from master.
2013-07-30 16:18:44 +02:00
Shai Berger
17e632929c
[1.6.x] Fixed #20785 -- Corrected exception caught for Oracle LIKE operator detection
...
The code that tests to see which LIKE expressions to use now runs
using non-error-wrapped cursor, so cx_Oracle exceptions need to be caught
rather than Django DatabaseErrors.
Thanks Trac user ludo for report and initial patch.
2013-07-30 03:32:02 +03:00
Florian Apolloner
081a27c358
[1.6.x] Simplified smart_urlquote and added some basic tests.
...
Backport of b70c371fc1
from master.
2013-07-28 10:07:01 +02:00
Tim Graham
dbbd2b1272
[1.6.x] Fixed #20805 -- Removed an extra colon beside checkboxes in the admin.
...
Thanks CollinAnderson for the report.
Backport of 8676318d2d
from master
2013-07-26 14:47:58 -04:00
Tim Graham
5cc1ea4773
[1.6.x] Updated contrib.admin to use Email/URLInputs; refs #16630
...
Backport of 2a979d2a7b
from master
2013-07-26 08:02:10 -04:00
Anssi Kääriäinen
7f892cedba
[1.6.x] Fixed related model lookup regression
...
It has been possible to use models of wrong type in related field
lookups. For example pigs__in=[a_duck] has worked. Changes to
ForeignObject broke that.
It might be a good idea to restrict the model types usable in lookups.
This should be done intentionally, not accidentally and without any
consideration for deprecation path.
Backpatch of 7cca8d56d2
from master.
2013-07-26 13:17:50 +03:00
Tim Graham
9abbad491a
[1.6.x] Fixed #20679 -- Corrected CachedFilesMixin.post_process docstring.
...
Thanks bmispelon for the report.
Backport of 9b88dd3809
from master
2013-07-25 12:32:38 -04:00
Anssi Kääriäinen
d439f85bbf
[1.6.x] Fixed ._meta.pk_index() virtual field failure
...
Backport of 92476e880c
from master
2013-07-25 16:35:04 +03:00
ersran9
7295a8262f
[1.6.x] Fixed #20791 -- Reworded ForeignKey default error message
...
Backport of 311c1d2848
from master.
2013-07-23 22:19:02 +02:00
Aymeric Augustin
4525eab077
[1.6.x] Fixed #20760 -- Reduced timing variation in ModelBackend.
...
Thanks jpaglier and erikr.
Backport of 5dbca13f3b
from master.
2013-07-23 15:43:43 +02:00
Kirill Fomichev
ad898453b7
[1.6.x] Fixed #19019 -- Fixed UserAdmin to log password change.
...
Thanks Tuttle for the report.
Backport of 33242fe015
from master
2013-07-23 08:33:38 -04:00
Anssi Kääriäinen
43f1d51b4b
[1.6.x] Minor change to get_extra_descriptor_filter()
...
Refs #20611 . Backpatch of 6b4967e883
.
2013-07-23 15:37:26 +03:00
Claude Paroz
92f66a6134
[1.6.x] Fixed #20773 -- [gis] Fixed regression in GoogleMap output
...
Thanks Martyn Clement for the report and the initial patch.
Backport of 27c1a7257
from master.
2013-07-22 10:03:31 +02:00
Claude Paroz
816bf0c6a7
[1.6.x] Fixed #20781 -- Fixed _has_changed regression with MultiValueField
...
Thanks Tim Graham for the report.
Backport of 02b0106d
from master.
2013-07-22 09:07:04 +02:00
Claude Paroz
48516d3b85
[1.6.x] Fixed an email validation regression
...
Thanks Vincent Wagelaar for the report.
Backport of 11b7b9ad
from master.
2013-07-21 21:12:50 +02:00
Karen Tracey
706e542eb5
[1.6.x] Fixed #13696 -- ensured inline pk field is rendered
...
Backport of 3aad955ea8
from master.
2013-07-21 13:13:20 -04:00
Simon Charette
9d3f7a21a3
[1.6.x] Fixed #20765 -- Set small values of `step` using exponential notation.
...
Browsers parse small factors of 10 as 0 under decimal notation.
Thanks to Trac alias matklad for the report and Claude Paroz for the review.
Backport of 415a36947c
from master.
2013-07-19 23:45:29 -04:00
Loic Bistuer
c660f0e985
[1.6.x] Fixed #20767 -- Fixed ModelAdmin.preserve_filters for namespaced URLs.
...
Thanks Collin Anderson for the report.
Backport of 2fc6c9472c
from master.
2013-07-18 18:23:21 -04:00
Tim Graham
e5241902f3
[1.6.x] Fixed #20681 -- Prevented teardown_databases from attempting to tear down aliases
...
Thanks simonpercivall.
Backport of d9c580306c
from master
2013-07-13 17:46:37 -04:00
Claude Paroz
db33b25e86
[1.6.x] Fixed #20582 -- Allowed default Form.label_suffix to be translated
...
Thanks Tim Graham for the review.
Backport of 7557207983
from master.
2013-07-13 16:20:09 +02:00
Tim Graham
7f210563ab
[1.6.x] Fixed backport of #20740
2013-07-12 18:00:09 -04:00
Tim Graham
45fab74561
[1.6.x] Fixed #20740 -- GenericIPAddressField should pass protocol to formfield()
...
Thanks Jeff250.
Backport of f2cb94f1c0
from master
2013-07-12 16:06:43 -04:00
Shai Berger
ae685e54cb
[1.6.x] Fixed last_executed_query test failure on Oracle
...
Backport of c0a4894dca
from master.
2013-07-09 19:52:16 +02:00
Tim Graham
7788c71890
[1.6.x] Fixed #20722 -- Fixed MemcachedCache backend get_many on Python 3.
...
Backport of 3c736207a3
from master
2013-07-09 11:57:44 -04:00
Claude Paroz
e2c1e9ef55
[1.6.x] Partial revert of commit 2bf403ecbd
...
Homework: write 100 times geoapp is not geogapp.
Backport of 57815e2630
from master.
2013-07-09 14:34:16 +02:00
Claude Paroz
0a84cbadb7
[1.6.x] Completed some more name_local names
...
Backport of 9383e37a7
.
2013-07-08 12:04:38 +02:00
Mathias Andre
ced144155e
[1.6.x] Fixed #20716 --Missing 'name_local' translation
...
Added 'name_local' translation for Albanian in LANG_INFO
Backport of 8c18f6f61c
from master.
2013-07-08 12:04:10 +02:00
SusanTan
40d2687787
[1.6.x] Fixed #20711 -- Fixed broken link in timesince.py docstring
...
Backport of d63327d843
from master.
2013-07-07 12:40:44 -04:00
Claude Paroz
a9dd6221af
[1.6.x] Fixed #20224 -- Update docs examples which mention __unicode__
...
Thanks Marc Tamlyn and Tim Graham for the review.
Backport of 7442eb1a24
from master.
2013-07-05 19:30:08 +02:00
Tim Graham
d14db25fee
[1.6.x] Fixed #19940 -- Made test.runner.setup_databases properly handle aliases for default db.
...
Thanks simonpercivall.
Backport of 2cbd579efe
from master.
2013-07-04 20:15:27 -04:00
Tim Graham
23748c483b
[1.6.x] Fixed #20673 -- Clarified that HttpRequest.user uses AUTH_USER_MODEL.
...
Thanks littlepig for the report.
Backport of f407f75aae
from master.
2013-07-04 09:34:02 -04:00
Simon Charette
2de0d4c452
[1.6.x] Fixed #20675 -- `check_password` should work when no password is specified.
...
The regression was introduced by 2c4fe761a
. refs #20593 .
Backport of 8759778185
from master.
2013-07-03 14:12:56 -04:00
Tomáš Ehrlich
2f9e5483f6
[1.6.x] Fixed #20687 -- Added documentation for django.core.signing API.
...
Thanks Baptiste Mispelon for the suggestion.
Backport of c5bc98d7e1
from master.
2013-07-03 10:38:53 -04:00
Tim Graham
3c51962cab
[1.6.x] Updated tests for deprecation of Option.get_(add|change|delete)_permission.
...
refs #20642 .
Backport of a6a905c619
from master.
2013-07-01 09:21:07 -04:00
Aymeric Augustin
02976a46c9
[1.6.x] Introduced getters for connection.autocommit and .needs_rollback.
...
They ensure that the attributes aren't accessed in conditions where they
don't contain a valid value.
Fixed #20666 .
Backport of dd9c6bc359
from master.
2013-06-30 16:29:57 +02:00
Tim Graham
b930733a67
[1.6.x] Fixed #20677 - Typos in generic_inlineformset_factory docs.
...
Thanks Riley Strong for the report.
Backport of 3fd0ee5b46
from master
2013-06-29 14:16:36 -04:00
Claude Paroz
59be2c6875
[1.6.x] Fixed #18592 -- Prevented crash when accessing MySQL _last_executed
...
Thanks reames at asymmetricventures.com for the report.
Backport of 59b0c48ce
from master.
2013-06-29 18:48:05 +02:00
Claude Paroz
a9b5a1e506
[1.6.x] Do not allow FileSystemStorage.delete to receive an empty name
...
Refs #20660 .
Backport of 7fbab3eba
from master.
2013-06-29 18:12:23 +02:00
Claude Paroz
b6aed803b2
[1.6.x] Fixed #20660 -- Do not try to delete an unset FieldFile
...
Thanks stanislas.guerra at gmail.com for the report and
Baptiste Mispelon for the review.
Backport of ea3fe78a9d
from master.
2013-06-29 18:11:51 +02:00
Aymeric Augustin
6908b65939
[1.6.x] Removed obsolete comment. Refs #20079 .
...
Thanks Gavin Wahl.
2013-06-29 11:43:41 +02:00
Jacob Kaplan-Moss
70f2d9aaff
Updated version numbers and setup.py for 1.6beta.
2013-06-28 08:15:10 -05:00
Shai Berger
d097417025
Support 'pyformat' style parameters in raw queries, Refs #10070
...
Add support for Oracle, fix an issue with the repr of RawQuerySet,
add tests and documentations. Also added a 'supports_paramstyle_pyformat'
database feature, True by default, False for SQLite.
Thanks Donald Stufft for review of documentation.
2013-06-28 06:59:10 +03:00
Tim Graham
534ced5aad
Fixed #20664 -- Fixed a bug with raw_id_fields on Python 3.
...
Thanks jefftriplett for the report.
2013-06-27 19:39:20 -04:00
Aymeric Augustin
c1284c3d3c
Fixed #20571 -- Added an API to control connection.needs_rollback.
...
This is useful:
- to force a rollback on the exit of an atomic block without having to
raise and catch an exception;
- to prevent a rollback after handling an exception manually.
2013-06-27 22:19:54 +02:00
Andrew Godwin
f325f86971
Fixed #20244 : PermissionsMixin now defines a related_query_name for M2Ms
2013-06-27 15:44:22 +01:00
Andrew Godwin
b21e96d00d
Merge pull request #1311 from loic/ticket20619_take2
...
Fixed missing initializations in WSGIRequest. Refs #20619
2013-06-27 07:44:09 -07:00
Andrew Godwin
99b467f272
Add related_query_name to ForeignKey/M2M. Refs #20244
2013-06-27 14:44:21 +01:00
Anton Baklanov
cab333cb16
Fixed #20541 -- don't raise db signals twice when creating superuser
2013-06-27 05:58:01 -04:00
Tim Graham
1184d07789
Fixed #14881 -- Modified password reset to work with a non-integer UserModel.pk.
...
uid is now base64 encoded in password reset URLs/views. A backwards compatible
password_reset_confirm view/URL will allow password reset links generated before
this change to continue to work. This view will be removed in Django 1.7.
Thanks jonash for the initial patch and claudep for the review.
2013-06-26 13:11:47 -04:00
Loic Bistuer
a9ea7d8c70
Fixed #20462 - Replaced the str() cast introduced in 273dc55
by force_text()
2013-06-26 21:30:58 +07:00
Andrew Clark
273dc550a4
Fixed #20462 -- null/non-string regex lookups are now consistent
...
Thanks to noirbizarre for the report and initial patch.
2013-06-26 08:13:26 -04:00
Loic Bistuer
48ce167d89
Fixed missing initializations in WSGIRequest. Refs #20619
2013-06-26 14:36:25 +07:00
Baptiste Mispelon
ec371ace00
Fixed #20650 -- Fixed {% filter %} incorrectly accepting 'escape' as argument
...
Thanks to grzesiof for the report and to loic84 and Alex Gaynor
for the review.
2013-06-25 20:28:35 +02:00
Simon Charette
b91787910c
Fixed #20642 -- Deprecated `Option.get_(add|change|delete)_permission`.
...
Those methods were only used by `contrib.admin` internally and exclusively
related to `contrib.auth`. Since they were undocumented but used
in the wild the raised deprecation warning point to an also undocumented
alternative that lives in `contrib.auth`.
Also did some PEP8 and other cleanups in the affected modules.
2013-06-25 12:22:37 -04:00
Javier Mansilla
f819bef3dc
Fixed #19773 - Added admin/popup_response.html template.
...
Thanks jimmylam@ for the suggestion.
2013-06-25 11:20:41 -04:00
Russell Keith-Magee
0346563939
Fixed #20653 -- Renamed checksetup management command.
...
This is to allow future compatibility with work that is ongoing in the 2013 GSoC.
2013-06-25 09:37:54 +08:00
Aymeric Augustin
5a6f12182e
Fixed #20636 -- Stopped stuffing values in the settings.
...
In Django < 1.6, override_settings restores the settings module that was
active when the override_settings call was executed, not when it was
run. This can make a difference when override_settings is applied to a
class, since it's executed when the module is imported, not when the
test case is run.
In addition, if the settings module for tests is stored alongside the
tests themselves, importing the settings module can trigger an import
of the tests. Since the settings module isn't fully imported yet,
class-level override_settings statements may store a reference to an
incorrect settings module. Eventually this will result in a crash during
test teardown because the settings module restored by override_settings
won't the one that was active during test setup.
While Django should prevent this situation in the future by failing
loudly in such dubious import sequences, that change won't be backported
to 1.5 and 1.4. However, these versions received the "allowed hosts"
patch and they're prone to "AttributeError: 'Settings' object has no
attribute '_original_allowed_hosts'". To mitigate this regression, this
commits stuffs _original_allowed_hosts on a random module instead of the
settings module.
This problem shouldn't occur in Django 1.6, see #20290 , but this patch
will be forward-ported for extra safety.
Also tweaked backup variable names for consistency.
Forward port of 0261922
from stable/1.5.x.
Conflicts:
django/test/utils.py
2013-06-24 20:43:44 +02:00
Baptiste Mispelon
299983616f
Fixed #20644 -- Add ModelFormMixin.fields to the CBV flattened index
...
Thanks to Tim Graham for the report and review.
2013-06-24 11:59:08 +02:00
Ramiro Morales
1559f84d8b
Fixed #20311 -- Make sure makemessages doesn't create duplicate Plural-Forms .po file headers.
...
Thanks naktinis for the report and initial patch.
2013-06-22 18:45:41 -03:00
Gilberto Gonçalves
680b512fc1
Fixed #20587 -- Made convert_values handle None values
2013-06-22 14:05:12 +01:00
Gilberto Gonçalves
ef37b23050
Fixed #18872 -- Added prefix to FormMixin
...
Thanks @ibustama for the initial patch and dragonsnaker for opening the
report.
2013-06-22 12:12:43 +01:00
Claude Paroz
ef79582e86
Fixed 17478 -- Allowed queryset overriding in BaseModelFormSet init
...
BaseModelFormSet.forms is now a cached property instead of being
populated in the __init__ method. This behaviour also matches an
example in the documentation.
Thanks Thomasz Swiderski for the report and Simon Charette for the
review.
2013-06-22 09:29:37 +02:00
Oliver Beattie
552a90b444
Fixed #20290 -- Allow override_settings to be nested
...
Refactored override_settings to store the underlying settings._wrapped
value seen at runtime, not instantiation time.
2013-06-21 16:57:47 +02:00
Simon Charette
04628e2016
Fixed #20630 -- Removed `maxlength` attribute from `NumberInput`.
...
This attribute is only allowed on inputs of type "text", "search", "url",
"tel", "email", or "password".
Thanks to yoyoma for the report and @bmispelon for the review.
2013-06-20 10:59:41 -04:00
Baptiste Mispelon
fdbcbb9ebd
Fixed #20632 -- Fixed {{ docs_version }} in project template
2013-06-20 15:39:58 +02:00
Russell Keith-Magee
18e79f1425
Fixed #20486 -- Ensure that file_move_safe raises an error if the destination already exists.
...
Thanks to kux for the report, and Russ Webber for the patch.
2013-06-20 18:55:27 +08:00
Christian Metts
c4a0c91459
Itty bitty typo fix.
...
"deletes" was missing it's last e.
2013-06-19 17:45:28 -06:00
Loic Bistuer
7462a78c1b
Fixed #20288 -- Fixed inconsistency in the naming of the popup GET parameter.
...
Thanks to Keryn Knight for the initial report and reviews,
and to tomask for the original patch.
2013-06-19 22:16:16 +02:00
Aymeric Augustin
ffcf24c9ce
Removed several unused imports.
2013-06-19 17:18:40 +02: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
Erik Romijn
2c4fe761a0
Fixed #20593 -- Allow blank passwords in check_password() and set_password()
2013-06-18 13:32:54 -04: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
Anssi Kääriäinen
aa22cbd51a
Fixed #20583 -- ORM always uses setup_joins() for join generation
...
There were a couple of places which used Query.join() directly. By
using setup_joins() in these places the code is more DRY, and in
addition there is no need to directly call field.get_joining_columns()
unless the field is the given join_field from get_path_info(). This
makes it easier to make sure a ForeignObject subclass generates joins
correctly in all cases.
2013-06-16 15:44:52 +03:00
Claude Paroz
beb652e069
Worked around Python 3.3 modified exception repr
...
Refs #20599 .
2013-06-15 11:14:59 +02:00
Jaap Roes
990f8d92dc
Fixed #20599 -- Changed wording of ValueError raised by _load_library
...
The _load_library method on BasePasswordHasher turns ImportErrors
into ValueErrors, this masks ImportErrors in the algorithm library.
Changed it to a clearer worded error message that includes
the ImportError string.
2013-06-15 10:50:55 +02:00
Marc Tamlyn
3873725861
Merge pull request #1272 from chicheng/addition-http-status-codes
...
Fixed #20598 -- Add new HTTP status codes defined in rfc6585
2013-06-14 07:39:13 -07:00
Anssi Kääriäinen
5459795ef2
Fixed #20289 -- pickling of dynamic models
2013-06-14 17:05:54 +03:00
Florian Apolloner
ffa8a9ab24
Fixed python 3.2 compat.
2013-06-14 15:44:45 +02:00