Commit Graph

14980 Commits

Author SHA1 Message Date
Javier Mansilla f819bef3dc Fixed #19773 - Added admin/popup_response.html template.
Thanks jimmylam@ for the suggestion.
2013-06-25 11:20:41 -04:00
Tim Graham e10757ff4d Doc cleanup for FormMixin.prefix; refs #18872. 2013-06-25 07:50:43 -04:00
Daniel Izquierdo 9a2b07f1b4 Fixed #20654 -- Fixed type of `m2m_changed`'s `pk_set` arg in docs 2013-06-25 09:46:17 +02: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
Tim Graham e161e4ff11 Clarified get_list_or_404 docs, refs #14150. 2013-06-24 07:00:53 -04: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
Baptiste Mispelon cd000dacc7 Fixed #20643 -- Fixed implementation of JSONResponseMixin in CBV docs
Thanks to Michal Sládek for the report and initial patch,
and to loic84 for the review.
2013-06-24 11:55:43 +02:00
Simon Meers 6466a0837b Corrected minor typos in FileUploadHandler.receive_data_chunk docs. 2013-06-24 13:59:03 +10:00
SusanTan b0907d66a5 Fixed #20524 - Described keywords in triaging contrib doc. 2013-06-23 15:41:24 -04:00
Baptiste Mispelon bd9fbd1497 Fixed errors and inconsistencies in CBV topic documentation.
The code examples should now work correctly.
The `get_context_data` method in the examples was changed when
necessary to adopt a singular style (get context with super(...),
add the extra keys to the dict then return it).

Thanks to Remco Wendt for the initial report and to Tim Graham
for the review.
2013-06-23 00:18:23 +02:00
Remco Wendt 338ec9333d Fixed a very old email address of mine still lingering in the AUTHORS file 2013-06-23 00:18:23 +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
Simon Charette ecf63d5d89 Added missing `versionadded` for `FormMixin.prefix`. 2013-06-22 16:49:24 -04:00
Andrew Godwin 864613c7e0 Merge pull request #1295 from LuRsT/fix_sqlite_convert_values_20587
Fixed #20587 -- Made convert_values handle None values
2013-06-22 06:10:33 -07:00
Gilberto Gonçalves 680b512fc1 Fixed #20587 -- Made convert_values handle None values 2013-06-22 14:05:12 +01:00
Marc Tamlyn 257a137c43 Merge pull request #1294 from LuRsT/added_prefix_to_form_mixin
Fixed #18872 -- Added prefix to FormMixin
2013-06-22 04:19:24 -07: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
Tim Graham 9be93aa809 Fixed #20634 - Corrected doc mistake re: staticfiles finders strategy.
Thanks claudep for the catch and bmispelon for the research.
2013-06-21 14:57:12 -04:00
James Bennett ba610cb319 Fixed #19881 -- Documented that get_next/previous_by_FOO uses default manager. 2013-06-21 13:14:05 -04:00
Baptiste Mispelon b53ed5ac55 Fixed #20612 -- Fixed incorrect wording in CBV documentation
Thanks to ndokos for the report.
2013-06-21 17:50:43 +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
Tim Graham 7314007c5b Fixed #19319 -- Updated example httpd.conf for Apache 2.4
Thanks colinnkeenan@ for the report.
2013-06-20 13:34:02 -04: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
Tim Graham 6ef199a08e Fixed error in last commit. Thanks Simon Charette. 2013-06-20 10:41:29 -04:00
Harm Geerts df4a74d709 Modified tutorial 3 to use RequestContext in place of Context. 2013-06-20 09:58:01 -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
Alex Gaynor 3671e7e3e0 Merge pull request #1287 from mintchaos/patch-1
Itty bitty typo fix.
2013-06-19 16:47:27 -07: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
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
Baptiste Mispelon b0b506b933 Fixed broken reference in documentation. 2013-06-19 10:37:24 +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
Aymeric Augustin a01b1ee688 Merge pull request #1280 from erikr/improve-password-reset2
Fixed #20079 -- Improved security of password reset tokens
2013-06-18 11:28:21 -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
Aymeric Augustin efe6e16008 Fixed #20615 -- Added trove classifiers for major Python versions. 2013-06-18 13:26:06 +02:00
Baptiste Mispelon b6f86fbeb1 Added myself to the commiters list. 2013-06-17 12:30:41 +02:00
Baptiste Darthenay 39b245fd76 Fixed #20614 -- Typo in documentation. 2013-06-17 11:35:07 +02: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