Jannis Leidel
3047981517
Fixed #18050 -- Fixed a rather glaring bug in the handling of @import statements when using the cached staticfiles storage.
2012-07-08 18:17:53 +02:00
Jannis Leidel
effc2cad95
Merge branch 'master' of github.com:django/django
2012-07-08 12:57:04 +02:00
Jannis Leidel
3727f6d096
Fixed #18430 -- Use the FILE_CHARSET setting when reading from a file during post processing with the cached staticfiles storage. Thanks to Brant Young for initial debugging.
2012-07-08 12:56:49 +02:00
Julien Phalip
8015593bc1
Fixed #17978 -- Fixed a minor layout issue when an inline contains a filter horizontal widget. Thanks to Aymeric Augustin for the report.
2012-07-07 15:41:04 -07:00
Florian Apolloner
a4bb7dd552
Merge branch 'master' of github.com:django/django
2012-07-07 15:49:00 +02:00
Jannis Leidel
0a68a2994b
Fixed #18254 -- Added ability to the static template tags to store the result in a contextt variable. Many thanks to Andrei Antoukh for the initial patch.
2012-07-07 15:30:25 +02:00
Florian Apolloner
52a9e15794
Fixed a regression in the user admin page introduced in a92e7f37c4
.
...
a92e7f37c4
switched most of the internal stuff
to format_html. Using format_html in the `render` method of
`ReadOnlyPasswordHashWidget` caused it to generate `SafeString` instances.
Later these safe strings where returned from `BoundField.__unicode__` which
caused force_unicode to loose the "safe" information. This commit fixes that by
ensuring that the render method returns `SafeUnicode` instead of `SafeString`.
2012-07-07 15:29:20 +02:00
Claude Paroz
8dafd04c45
Fixed #17257 - Removed outdated comment in syndication view
...
Thanks krzysiumed for the patch.
2012-07-07 11:34:04 +02:00
Adrian Holovaty
8855f9380e
Merge pull request #176 from benspaulding/ticket_18521
...
Add reST role to templates named in some view docs.
2012-07-06 12:46:26 -07:00
Guilherme Gondim
91e4f7effb
Fix copyright holder
2012-07-06 15:24:07 -03:00
Luke Plant
2ba4278cb3
Fixed #18484 - 'display:none' on CSRF token div is redundant and causes problems with some browsers
...
Thanks to hedleyroos for the report
2012-07-06 15:33:29 +01:00
Luke Plant
8fdc56d2a6
Fixed #18572 - Python26 string format incompatibility
...
Thanks to anonymous/AeroNotix for the report
2012-07-06 00:23:02 +01:00
Anssi Kääriäinen
d3c2eb103f
Fixed #18330 - Made cache culling 3rd party db backend friendly
...
This is Ian Kelly's patch from #15580 with minor modifications.
2012-07-05 17:20:48 +03:00
Andrei Antoukh
0f49b2bce2
Fixed #18362 - Made model.save() update_fields accept attnames
2012-07-05 16:43:28 +03:00
Luke Plant
a222d6e800
Fixed incorrect URL to object on delete confirmation and history page
2012-07-03 22:20:12 +01:00
Luke Plant
b0eee0ba4b
Removed various unnecessary instances of mark_safe applied to URLs
...
Also fixed some test breakages introduced in last commit
2012-07-03 22:20:12 +01:00
Luke Plant
a92e7f37c4
Changed a lot of internal code to use 'format_html' where appropriate/possible
2012-07-03 22:20:12 +01:00
Luke Plant
bee498f3a2
Added 'format_html' utility for formatting HTML fragments safely
2012-07-03 22:20:12 +01:00
Luke Plant
f33e150369
Documented utils.html.escape and conditional_escape
2012-07-03 22:20:12 +01:00
Anssi Kääriäinen
ab7f071058
Fixed comment wording in sql/where.py
...
Thanks to Simon Charette for noticing this.
2012-07-03 10:31:06 +03:00
Julien Phalip
2cd4cf58d3
Fixed #18550 -- Ensured that the admin history view works with escaped primary keys.
...
Thanks to josh.oosterman for the report and patch.
2012-07-01 18:40:50 -07:00
Anssi Kääriäinen
e74787391e
Fixed a regression introduced in where.as_sql() refactor
...
At least Oracle needs parentheses in negated where conditions, even if
there is only single condition negated. Fixed this by reverting to old
logic in that part of as_sql() and adding a comment about this.
I did not investigate why the parentheses are needed. The original
offending commit was bd283aa844
.
2012-07-01 22:52:35 +03:00
Anssi Kääriäinen
f572ee0c65
Fixed #16047 -- Restore autocommit state correctly on psycopg2
...
When the postgresql_psycopg2 backend was used with DB-level autocommit
mode enabled, after entering transaction management and then leaving
it, the isolation level was never set back to autocommit mode.
Thanks brodie for report and working on this issue.
2012-07-01 19:36:43 +03:00
Anssi Kääriäinen
da573fbb41
Fixed some locations to work with autocommit=True
...
- backends: supports_transactions()
- select_for_update tests
2012-07-01 19:27:36 +03:00
Anssi Kääriäinen
bd283aa844
Refactored the empty/full result logic in WhereNode.as_sql()
...
Made sure the WhereNode.as_sql() handles various EmptyResultSet and
FullResultSet conditions correctly. Also, got rid of the FullResultSet
exception class. It is now represented by '', [] return value in the
as_sql() methods.
2012-07-01 17:21:34 +03:00
Anssi Kääriäinen
2b9fb2e644
Fixed #18251 -- Removed a deadlock possibility in apploading
...
Thanks to harm for the report and comments.
2012-07-01 16:14:27 +03:00
Claude Paroz
da200c5e35
Fixed #16519 -- Deprecated mimetype kwarg of HttpResponse __init__
...
This keyword was already deprecated in the code (supported for
backwards compatibility only), but never formally deprecated.
Thanks Paul McMillan for the report and yasar11732 for the initial
patch.
2012-06-30 21:27:47 +02:00
Claude Paroz
deed192dda
Removed usage of mimetype kwarg of HttpResponse
...
Refs #16519 .
2012-06-30 21:19:07 +02:00
Claude Paroz
2c2c8a6326
Isolated sitemaps test from ABSOLUTE_URL_OVERRIDES
...
Refs #15988 .
2012-06-30 18:50:28 +02:00
Claude Paroz
db87016b1a
Fixed #12493 -- Deprecated auto-correction of TEMPLATE_DIRS
2012-06-30 15:06:42 +02:00
Claude Paroz
47da7b7a9a
Fixed #18102 -- Defined min/max_length on French localflavor form fields
...
Thanks mothsART for the report and the initial patch.
2012-06-30 13:18:07 +02:00
Claude Paroz
26cb227cfe
Fixed #15197 -- Fixed yaml serialization into HttpResponse
...
Thanks fourga38 for the report and hirokiky at gmail.com for the
initial patch.
2012-06-28 16:29:29 +02:00
Ben Spaulding
24dec9edaa
Add reST role to templates named in some view docs.
...
This makes the templates link up correctly in the admindocs.
2012-06-26 21:45:45 -05:00
Josh Smeaton
fa182e8ae8
Fixed #18465 -- Set date formats correctly on Oracle
...
Correctly configure NLS_SESSION_PARAMETERS to format Date and DateTime
on Oracle backend.
Thanks to Josh Smeaton for report & patch.
2012-06-26 19:39:14 +03:00
Claude Paroz
05d333ba3b
Fixed #18515 -- Conditionally regenerated filename in FileField validation
...
When a FileField value has been saved, a new validation should not
regenerate a new filename when checking the length. Refs #9893 .
2012-06-26 18:18:44 +02:00
Anssi Kääriäinen
b6c356b7bb
Fixed #17485 -- Made defer work with select_related
...
This commit tackles a couple of issues. First, in certain cases there
were some mixups if field.attname or field.name should be deferred.
Field.attname is now always used.
Another issue tackled is a case where field is both deferred by
.only(), and selected by select_related. This case is now an error.
A lot of thanks to koniiiik (Michal Petrucha) for the patch, and
to Andrei Antoukh for review.
2012-06-26 18:08:42 +03:00
Claude Paroz
5318783027
Fixed #17966 -- Isolated ProfileTestCase from custom AUTH_PROFILE_MODULE
...
Thanks Rob Golding for helping on the patch.
2012-06-25 20:26:17 +02:00
Claude Paroz
4b722b31e1
Fixed #16317 -- Fixed dumpdata for self-referencing models and natural keys
...
Thanks aldaran for the patch.
2012-06-24 19:54:56 +02:00
Alex Gaynor
e0fce8706d
Switch to using context managers for acquiring and releasing locks.
2012-06-23 08:11:15 -07:00
Alex Gaynor
e1b74d0094
Don't use a list comprehension when we don't need the resulting list.
2012-06-23 07:54:45 -07:00
Dmitry Medvinsky
d4da08375b
Fixed #18454 -- Added ability to pass a list of signals to `receiver`.
...
Added ability to use receiver decorator in the following way:
@receiver([post_save, post_delete], sender=MyModel)
def signals_receiver(sender, **kwargs):
...
2012-06-23 16:31:16 +02:00
Florian Apolloner
7f225880e4
Corrected the `instance_dict` description for form wizards.
2012-06-22 15:46:49 +02:00
Florian Apolloner
6bc1b22299
Fixed our HTMLParser patches for python 2.7.4
2012-06-22 15:09:26 +02:00
Luke Plant
a54a8bab0c
Fixed #17776 - DoesNotExist is not picklable
...
Thanks to ambv for the report
2012-06-22 13:28:15 +01:00
Claude Paroz
41eb70f762
Fixed #15271 -- Defined a to_python method for GeometryField
...
Thanks volrath and copelco for their work on the patch.
2012-06-19 14:55:40 +02:00
danger
45a1a54b0b
Added support for gdal 1.9.
2012-06-19 11:33:27 +02:00
Chris Beaven
c57ba67331
Fixed #14502 again -- saner verbatim closing token
...
Previously, the closing token for the verbatim tag was specified as the
first argument of the opening token. As pointed out by Jannis, this is
a rather major departure from the core tag standard.
The new method reflects how you can give a specific closing name to
{% block %} tags.
2012-06-19 10:49:33 +12:00
Daniel Hepper
aee9eecb92
Fixed #18444 -- Replace hard coded "View on Site" URLs
2012-06-18 18:12:29 +02:00
Daniel Hepper
108f8dddea
Fixed #18450 -- Removed default values for i18n JavaScript URLs in Admin templates
2012-06-18 18:09:05 +02:00
Florian Apolloner
ac1b9ae630
Fixed GIS testsuite.
...
Moved HAS_SPATIALREFSYS back into the tests namespace since it only operates
on the default database and isn't a global flag like HAS_GDAL.
2012-06-17 11:39:02 +02:00
Julien Phalip
d708298184
Fixed #18420 -- Prevented the admin JS from crashing when the main form contains no field. Thanks to maciej.maciaszek for the report and patch.
2012-06-16 17:18:23 -07:00
Julien Phalip
fadcc6ddb7
Updated the admin's minified JS files.
2012-06-16 16:23:39 -07:00
Julien Phalip
1ace912f7e
Fixed #18477 -- Fixed colspan value when a TabularInline form contains validation errors. Thanks to yedpodtrzitko for the report and patch.
2012-06-16 14:29:41 -07:00
Julien Phalip
1794e36fa1
Skip GeometryFieldTest if there's no spacial database.
2012-06-16 13:57:33 -07:00
Claude Paroz
5bdd0d6b6a
Favored text (StringIO) over binary content for deserialization
...
This is also more Python 3 compatible, as the json module in
Python 3 is expecting text. Thanks Vinay Sajip for noticing it.
2012-06-15 14:49:19 +02:00
Luke Plant
fd6a9d35d9
IfParser.next() method renamed to avoid confusion with iterator protocol.
2012-06-14 23:12:15 +01:00
Luke Plant
edee20ff50
Reverted part of 169b1a40
which was mistakenly applied to a non-iterator class.
...
Doing next(IfParser()) works for Python 2.7, because it calls
IfParser.next(), but in Python 3 will call IfParser.__next__() which does
not work since it is not an iterator and does not have that method.
2012-06-14 23:12:15 +01:00
Claude Paroz
023b70415b
Executed SpatialRefSysTest only with spatial backend
2012-06-14 21:44:08 +02:00
Claude Paroz
88601bad84
Discovered some geodjango tests with standard mechanism
...
No need to special case tests discovery for regular first-level
gis tests.
2012-06-14 21:10:30 +02:00
Claude Paroz
4d46106f8c
Fixed #17754 -- Refactored gis.measure
...
This refactoring does allow much easier MeasureBase subclassing.
Many thanks to Ricardo di Virgilio for the initial patch.
2012-06-14 15:32:42 +02:00
Claude Paroz
fe873e2765
Fixed #12140 -- Fixed http.urlencode result for empty lists
...
Thanks aneil for the report and the initial patch.
2012-06-14 11:32:40 +02:00
Anssi Kääriäinen
86c20e39eb
Fixed connection.queries encoding handling on Oracle
...
In addition, removed a possibly problematic .filter() call from
backends.test_query_encoding test. It is possible the .filter could
cause collation problems on MySQL, and as it wasn't absolutely needed
for the test it seemed better to get rid of the call.
Refs #18461 .
2012-06-13 14:16:34 +03:00
Claude Paroz
e9ef9776d1
Fixed #18461 -- Ensured that last_executed_query returns Unicode
...
Thanks Anssi Kääriäinen for the review.
2012-06-13 12:04:46 +02:00
Claude Paroz
35f9c2c07a
Cleaned up locale-related encoding issues
2012-06-12 14:23:41 +02:00
Claude Paroz
3dd5d726d1
Fixed #18463 -- Forced type() argument to be a byte string
2012-06-11 22:14:06 +02:00
Jannis Leidel
c4c7fbcc0d
Fixed #18451 -- Vastly improved class based view documentation.
...
Many thanks to Daniel Greenfeld, James Aylett, Marc Tamlyn, Simon Williams, Danilo Bargen and Luke Plant for their work on this.
2012-06-11 10:40:23 +02:00
Claude Paroz
1a10a06b9f
Fixed #18457 -- Fixed encoding error in yaml deserializer
...
Thanks jpaugh64 for the report.
2012-06-10 19:56:16 +02:00
Luke Plant
e9497a3803
Corrected way to get URL of object in admin history template
2012-06-10 06:18:16 +01:00
Claude Paroz
fc40a6504b
Fixed #17159 -- Validated returned number of next|previous_page_number
...
Thanks mehta.apurva at gmail.com for the report and the initial patch
and neaf for the complete patch.
2012-06-09 17:55:24 +02:00
Claude Paroz
ad47364dd3
Reverted 905e33f
, now that DatabaseFeatures does not need confirm
...
Connection.features does not need to be confirmed any more, after
commit aa42357
, rendering obsolete the workaround when using
TEST_MIRROR (Refs #16885 , #17760 ).
2012-06-09 17:05:54 +02:00
Claude Paroz
aa423575e7
Fixed #17760 -- Implemented callable database features as cached properties
...
This does remove the requirement to call features.confirm() method
before checking the properties.
Thanks cdestiger and Ramiro Morales for their work on the patch.
2012-06-09 15:59:52 +02:00
Anssi Kääriäinen
484fcd34a4
Fixed #16418 -- Made generic views work with ModelForms
...
Generic views assumed any object's _meta will be model Options. This
is not true for ModelForms for example. Took isinstance(obj, Model)
in use instead.
2012-06-09 01:12:14 +03:00
Anssi Kääriäinen
a035d9d650
Cleaned whitespace errors introduced in previous commit
2012-06-08 23:52:43 +03:00
Simon Charette
b6d533af4d
Fixed #18399 – Added a way to get ContentTypes for proxy models
...
Added kwargs for_concrete_model and for_concrete_models to ContentType
methods get_for_model() and get_for_models(). By setting the flag to
False, it is possible to get the contenttype for proxy models.
2012-06-08 23:07:58 +03:00
Anssi Kääriäinen
90985048fc
Used git log instead of git show for last commit's timestamp
...
The reason for this was that git show included the whole changeset in
the output, but only the UTC timestamp was needed. By using git log
it is possible to get just the timestamp. The whole changeset can be
large, and can cause unicode encoding errors.
2012-06-08 23:04:03 +03:00
Aymeric Augustin
23d230f058
Merge pull request #123 from apollo13/ticket18381
...
Fixed #18381 -- Stopped escaping object ids
when passing them to the contenttypes.shortcut view.
Thanks apollo13 for the patch and dhepper for the review.
2012-06-08 01:48:41 -07:00
Daniel Hepper
0ae727beda
Fixed #18433 -- Fixed "View on Site" link in inline admin for models with custom PK
2012-06-07 21:08:36 +02:00
Jann Kleen
1a412dda62
Fixed #18432 -- Prevented the ForeignKey field from creating an invalid query when chained. Thanks, Jann Kleen.
2012-06-07 18:49:19 +02:00
Claude Paroz
5e6ded2e58
Fixed #18363 -- Added Python 3 compatibility layer.
...
Thanks Vinay Sajip for the support of his django3 branch
and Alex Gaynor, kezabelle, YorikSar for the review.
2012-06-07 18:36:53 +02:00
Claude Paroz
4a103086d5
Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
...
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
2012-06-07 18:08:47 +02:00
Florian Apolloner
e1643e3535
Don't escape object ids when passing to the contenttypes.shortcut view.
...
This commit also changes the string pk to string_pk instead of id, to test
if the admin uses .pk throughout the codebase.
2012-06-07 17:52:12 +02:00
Aymeric Augustin
17f3e9258e
Fixed #18397 -- Avoided referencing lawrence.com.
...
This commit includes multiple small related changes, see the ticket
for a full discussion.
2012-06-07 11:50:20 +02:00
Claude Paroz
6fd1950a4e
Fixed #10200 -- Raised CommandError when errors happen in loaddata.
2012-06-07 10:32:10 +02:00
Aymeric Augustin
4464bbba15
Fixed #14502 -- Added a verbatim template tag.
...
Thanks SmileyChris for the patch.
2012-06-07 09:59:14 +02:00
Luke Plant
f5ce1793a8
Small cleanup in prefetch_related code
2012-06-06 14:19:06 +01:00
Luke Plant
4fea46a030
Fixed #18309 - Prefetch related does not work for fkey to multitable inherited model
...
Thanks to milosu for the report, tests and initial patch.
2012-06-06 14:17:32 +01:00
Claude Paroz
f0664dc8ae
Made TestNoInitialDataLoading pass with MySQL (Refs #15926 )
2012-06-06 13:54:40 +02:00
Claude Paroz
70a0351fef
Fixed #18184 -- Moved algorithm identification code to hashers module
...
Thanks Eli Collins for the report and the patch.
2012-06-06 11:06:33 +02:00
Claude Paroz
eb286aa22f
Delayed encoding of password and salt in password checking.
...
Applied the rule that string encoding should happen as late as
possible. This is also a preparation for Python 3 compatibility.
2012-06-06 10:53:16 +02:00
Claude Paroz
9c096ab981
Fixed #17328 -- Added OpenLayersWidget _has_changed method
...
Thanks Will Hardy for the report and the patch.
2012-06-06 10:42:14 +02:00
Claude Paroz
17824e2b74
Fixed #17736 -- Kept maximal floating-point accuracy in from_bbox
...
When constructing a polygon with Polygon.from_bbox, do not convert
parameters to strings at this stage (str defaults to 12 significant
digits).
Thanks tdihp@hotmail.com for the report and David Eklung for the patch.
2012-06-06 10:09:32 +02:00
Honza Kral
fedac99c85
Fixed #15926 -- Added option --no-initial-data to syncdb and flush.
...
Thanks msiedlarek, jpaugh64 and vlinhart!
2012-06-05 16:46:15 +02:00
martin.bohacek
eee791e9b2
Merge branch 'master' of https://github.com/django/django
2012-06-05 13:29:33 +02:00
martin.bohacek
fbb7389439
Ticket #17804 fix.
2012-06-05 13:28:32 +02:00
Claude Paroz
5ef599c7b3
Used skipUnless decorator to skip tests in geos tests.
2012-06-04 20:39:54 +02:00
Julien Phalip
f699641161
Fixed #17138 -- Made the sensitive_variables decorator work with object methods.
2012-06-03 23:44:13 -07:00
Samuel Sutch
43a46e9004
Remove the summary attribute of the table
...
In the discussion here: https://code.djangoproject.com/ticket/17138
it was decided that using the caption for this previously
non-visible part of the table element was not semantic, so in this
patch is moves that summary to the `title` attribute of the `a`
tag which when overed over, on most browsers, will show the text.
2012-06-03 12:44:37 -07:00
Claude Paroz
6522283a71
Fixed #14478 -- Isolated messages tests from custom TEMPLATE_CONTEXT_PROCESSORS
2012-06-02 21:28:18 +02:00
Claude Paroz
7676d6e764
Made sitemaps tests use override_settings. Refs #14478
2012-06-02 21:24:18 +02:00
Ramiro Morales
72130385bf
Made inspectdb tests deal with a smaller generated models.py file.
...
Implemented this by adding a stealth table_name_filter option for the
command.
2012-06-01 21:46:07 -03:00