Andrew Godwin
763ac8b642
First pass on squashmigrations command; files are right, execution not.
2013-10-16 12:00:07 +01:00
Andrew Godwin
42f8666f6a
Improve migration optimizer to be able to optimize through other ops
2013-10-16 11:09:33 +01:00
Alex Gaynor
694d7da6c5
Merge pull request #1744 from unaizalakain/ticket_7261
...
Fixed #7261 -- support for __html__ for library interoperability
2013-10-15 14:43:35 -07:00
Tim Graham
6138186848
Merge pull request #1755 from loic/typo
...
Fixed DeprecationWarning caused by assertEquals.
2013-10-15 12:30:02 -07:00
Loic Bistuer
776b6470c1
Fixed DeprecationWarning caused by assertEquals.
2013-10-16 02:28:04 +07:00
Claude Paroz
2af58a2cef
Made sqlite introspection also show views like other backends
...
Refs #6730 .
2013-10-15 17:20:03 +02:00
Marc Tamlyn
349c12d3f5
Fixed #16855 -- select_related() chains as expected.
...
select_related('foo').select_related('bar') is now equivalent to
select_related('foo', 'bar').
Also reworded docs to recommend select_related(*fields) over select_related()
2013-10-15 15:59:36 +01:00
Claude Paroz
dd1ab8982b
Moved misplaced import in backends init
2013-10-15 16:36:31 +02:00
Ryan Allen
f719d4afc7
Updated admin alert colors
...
refs #21220 .
2013-10-15 10:18:51 -04:00
Daniele Procida
ec0e780e7f
Merge pull request #1751 from tmaster/ticket_21006_improvement
...
Improvement on InlineFormSet doc, refs #21006
2013-10-15 06:56:25 -07:00
Tianyi Wang
944a2bb7c1
Improvement on InlineFormSet doc, refs #21006
2013-10-15 14:51:45 +01:00
Claude Paroz
949076eb11
Fixed #21263 -- Fixed issue with override_settings in inherited classes
...
When both parent and child classes are decorated with override_settings,
child class settings should take precedence.
Thanks Sephi for the report and Marc Tamlyn for the review.
2013-10-15 15:38:27 +02:00
Unai Zalakain
c7634cd7fe
Fixed #7603 -- Added a 'scheme' property to the HttpRequest object
...
`HttpRequest.scheme` is `https` if `settings.SECURE_PROXY_SSL_HEADER` is
appropriately set and falls back to `HttpRequest._get_scheme()` (a hook
for subclasses to implement) otherwise.
`WSGIRequest._get_scheme()` makes use of the `wsgi.url_scheme` WSGI
environ variable to determine the request scheme.
`HttpRequest.is_secure()` simply checks if `HttpRequest.scheme` is
`https`.
This provides a way to check the current scheme in templates, for example.
It also allows us to deal with other schemes.
Thanks nslater for the suggestion.
2013-10-15 09:04:12 -04:00
Tianyi Wang
9bfe66164e
Fixed #21006 -- Added example code for overriding methods on an InlineFormSet.
...
Thanks treysta at gmail.com for the suggestion.
2013-10-15 07:34:29 -04:00
Marc Tamlyn
ce823d3710
Merge pull request #1382 from loic/ticket19617
...
Fixed #19617 -- Refactored form metaclasses to support more inheritance scenarios.
2013-10-15 04:22:34 -07:00
Florian Apolloner
ed8919cbcb
Handle Apps with South migrations as unmigrated apps.
2013-10-15 11:57:30 +02:00
Tim Graham
975415a8ce
Fixed a webdesign template tag docstring to prevent parsing as metadata.
...
Previously admindocs would throw an error when processing it:
"Error in "default-role" directive: no content permitted."
refs #6681
2013-10-14 19:48:24 -04:00
Unai Zalakain
af64429b99
Fixed #7261 -- support for __html__ for library interoperability
...
The idea is that if an object implements __html__ which returns a string this is
used as HTML representation (eg: on escaping). If the object is a str or unicode
subclass and returns itself the object is a safe string type.
This is an updated patch based on jbalogh and ivank patches.
2013-10-15 00:42:42 +02:00
Sorcha Bowler
018e2c055a
Fixed #21223 -- Added form.id_for_label to topic guide.
...
Thanks ebertti at yahoo.com.br for the suggestion.
2013-10-14 18:41:22 -04:00
Larry O'Neill
83b9bfea44
Fixed #21266 -- Fixed E201,E202 pep8 warnings.
2013-10-14 18:12:00 -04:00
Claude Paroz
42a67ec1cd
Fixed #21269 -- Don't crash when CommandError contains non-ascii
...
Thanks kontakt@eikefoken.de for the report.
2013-10-14 21:21:07 +02:00
Ramiro Morales
8ab5f1fe47
Close file after tests added in 945e033a69
.
...
Avoids failures on Windows. Refs #8918 .
2013-10-14 15:34:43 -03:00
Tim Graham
1ac534a92f
Added flake8 info to setup.cfg.
...
This config allows a clean run of flake8. Some of the ignored
codes will be remove over time as we clean things up.
2013-10-14 13:43:40 -04:00
M Nasimul Haque
d07d6ae116
Fixed #20910 -- Added a "snippet" sphinx directive to allow prefixing a filename.
...
Thanks Marc Tamlyn for the suggestion.
2013-10-14 13:00:57 -04:00
Bouke Haarsma
e077224f4a
Fixed #20962 -- Documented that template tag render() may raise exceptions.
...
Thanks Keryn Knight for the report.
2013-10-14 11:53:15 -04:00
Loic Bistuer
b16dd1fe01
Fixed #8620 -- Updated the Form metaclass to support excluding fields by shadowing them.
2013-10-14 22:42:33 +07:00
Loic Bistuer
ac5ec7b8bc
Fixed #19617 -- Refactored Form metaclasses to support more inheritance scenarios.
...
Thanks apollo13, funkybob and mjtamlyn for the reviews.
2013-10-14 21:59:30 +07:00
Loic Bistuer
54cd930baf
Clarfied the ModelForm docs with respect to generated vs. declared fields.
...
The ModelForm docs suggested that fields defined declaratively override
default fields generated from the form Meta.
This is conceptually wrong, especially with inheritance in mind. Meta is
usually defined on the topmost ModelForm subclass, while fields can come
from anywhere in the MRO, especially base classes; therefore we suggested
that something defined in a base class override something from a subclass.
This patch rephrases the docs around the idea that Meta is used to generate
*missing* fields.
Refs #8620 , #19617 .
Thanks @mjtamlyn and @timgraham for the review.
2013-10-14 10:54:22 -04:00
Bouke Haarsma
9b7d38ed5a
Fixed #21210 -- Documented when runserver doesn't auto-restart.
...
Thanks gergely at polonkai.eu for the suggestion.
2013-10-14 10:36:18 -04:00
Marc Tamlyn
8ce3c3a928
Merge pull request #1733 from joaoxsouls/#18866
...
Fixed #18866 -- added validation error for verbose_name longer than 39 characters
2013-10-14 06:20:59 -07:00
joaoxsouls
1ab27e9a65
Fixed #18866 -- added validation error for verbose_name longer than 39 characters
...
Added a validation error check when creating the permissions for model, to avoid
cryptic database error when the verbose_name is longer than 39 characters
thanks elena for reporting it
2013-10-14 14:19:35 +01:00
Bouke Haarsma
8fc63087f6
Fixed #21264 -- Incorrect RST usage in docs
2013-10-14 08:14:27 -04:00
Max Vizard
13ddf0e002
Fixed #21027 -- Updated tutorial 5 docs to link to management shell command page.
2013-10-14 08:07:44 -04:00
Claude Paroz
1e8eadc94e
Fixed #15888 -- Made tablename argument of createcachetable optional
...
Thanks Aymeric Augustin for the report and the documentation and
Tim Graham for the review.
2013-10-14 13:24:40 +02:00
Marc Tamlyn
b600bb7e08
Amend my description in committers.txt.
2013-10-14 11:54:37 +01:00
Claude Paroz
ef22d512b5
Imported custom user classes in tests depending on it
...
Without those imports, affected test files cannot be run
independently. Refs #21164 .
2013-10-14 10:14:24 +02:00
Aymeric Augustin
d9b6fb8f61
Fixed #21256 -- Error in datetime_safe.datetime.combine.
2013-10-13 19:09:26 +02:00
Aymeric Augustin
589dc49e12
Fixed #21198 -- Prevented invalid use of @python_2_unicode_compatible.
...
Thanks jpic for the report and chmodas for working on a patch.
Reverts 2ea80b94
. Refs #19362 .
2013-10-13 18:14:04 +02:00
Aymeric Augustin
570d9c2678
Fixed #19560 -- Identified field in warning for naive datetime.
...
Thanks gcc for the report and vajrasky for the patch.
2013-10-13 11:54:11 +02:00
Claude Paroz
00a73c1c69
Fixed #21173 -- Stopped fixing format for date-based widgets at init time
...
Thanks Marc Tamlyn for the review.
2013-10-12 18:31:19 +02:00
Ramiro Morales
18ea1c473b
Forms docs: More emphasis in 'id' value customizability.
2013-10-12 13:29:11 -03:00
Claude Paroz
21c2bfdff3
Updated OpenLayers version from 2.11 to 2.13
2013-10-12 18:08:07 +02:00
Tim Graham
dd839a2dfd
Fixed #15582 -- Documented how TransactionTestCase.multi_db affects fixtures.
...
Thanks slinkp for the suggestion.
2013-10-11 20:11:49 -04:00
Tim Graham
ad17d6a85f
Fixed errors in 848101bf17
2013-10-11 17:58:07 -04:00
Cody Scott
8bfc7cc64c
Minor edits to docs/topics/db/queries.txt.
2013-10-11 15:34:11 -04:00
Sascha Peilicke
848101bf17
Added tests for URLValidator schemes.
2013-10-11 13:41:38 -04:00
Tai Lee
e527c0b6d8
Fixed #13252 -- Added ability to serialize with natural primary keys.
...
Added ``--natural-foreign`` and ``--natural-primary`` options and
deprecated the ``--natural`` option to the ``dumpdata`` management
command.
Added ``use_natural_foreign_keys`` and ``use_natural_primary_keys``
arguments and deprecated the ``use_natural_keys`` argument to
``django.core.serializers.Serializer.serialize()``.
Thanks SmileyChris for the suggestion.
2013-10-11 12:52:57 -04:00
Tim Graham
945e033a69
Fixed #8918 -- Made FileField.upload_to optional.
...
Thanks leahculver for the suggestion and dc and vajrasky for work
on the patch.
2013-10-11 08:07:25 -04:00
Tim Graham
b67ab75e82
Fixed assorted flake8 errors.
2013-10-11 07:25:14 -04:00
Cody Scott
695bc0d191
Small improvements to docs/topics/db/models.txt
2013-10-10 20:56:11 -04:00