0
0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Commit Graph

9600 Commits

Author SHA1 Message Date
Luke Plant
80f4826063 Fixed #15025 - template debug fails if there's a callable local var that generates an exception
Thanks to Tai Lee for the patch and report, also to Don Spaulding.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 13:47:03 +00:00
Ramiro Morales
e1ede214e6 Fixed #13668 -- Corrected database router methods invocation for ManyToMany fields without through models. Thanks craig.kimerer for the report and David Gouldin for the fix.
This also adds tests for r14857.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 04:11:41 +00:00
Ramiro Morales
fd12e3b218 Fixed #15024 -- Ensure that choice of L10N format module used is stable given a stable setup of format modules in ll/ and ll_CC/ dirs. Thanks David Reynolds for the report and suggestions leading to the solution.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 03:02:32 +00:00
Ramiro Morales
1c56af676d Added tests demonstrating that filtering lookup expression that involve model with inheritance schemes aren't incorrectly blacklisted by the r15031 security fix. Refs. #15032.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:30:47 +00:00
Alex Gaynor
f544d98896 2 small optimizations: a) move an import out of a function, b) remove a cache that did nothing, tiny tiny speed up on CPython, but a big one on PyPy
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 13:39:31 +00:00
Alex Gaynor
29de7ee9cb Fixed #11293 -- fixed using Q objects to generate ORs with aggregates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-11 01:00:50 +00:00
Timo Graham
1b90cdcf23 Fixed #15045 - Typo auto_add_now -> auto_now_add; thanks dr_gone for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-11 00:29:38 +00:00
Andrew Godwin
ea774bf9a7 Fix wrong attribute name in [15156]. Thanks to Alex Gaynor for spotting this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-10 13:44:35 +00:00
Jannis Leidel
937548bba4 Fixed #15043 -- Updated the login function to send the user_logged_in signal after the user's session got recycled instead of before. Thanks, Rob Hudson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-10 08:15:52 +00:00
Ramiro Morales
730769d1af Fixed #14951 -- Made the unique_for_{date,month,year} model field constraints to not fail when the related DateField is empty.
Existing modelforms tests were extended to cover this case and an equivalent set of tests was added for the model functionality.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-09 13:26:39 +00:00
Timo Graham
30c8a5574a Fixed #15003 - assorted edits to admin docs; thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 21:15:00 +00:00
Andrew Godwin
614672d365 Fixed #14888 -- Removing duplicated code in serialisers. Thanks to eric.fortin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 15:07:45 +00:00
Andrew Godwin
1ad644c0f0 Fixed #14929 -- Move gzip_page docstring to the right place. Thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 14:55:19 +00:00
Andrew Godwin
4a9ecdb148 Fixed #14995 -- Add FormView import to generic views __init__. Thanks carbonXT.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 14:53:44 +00:00
Andrew Godwin
d216ff9b92 Fixed #12295 -- Issue had already been fixed, but added test. Thanks tomevans222 and dpn.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 14:37:26 +00:00
Andrew Godwin
81e05a418d Fixed #9029 -- Allow use of fieldname_id with get_or_create. Thanks to aaron and mrmachine.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 13:27:30 +00:00
Andrew Godwin
32a344dfe2 Fixed inconsistency in ListView's pagination (short datasets should also trigger a pagination, but with a single possible page)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 13:15:44 +00:00
Jannis Leidel
19ab52f77f Fixed #15035 -- Fixed collectstatic management command to work with non-local storage backends correctly. Also refactored a bit code smell.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 10:03:27 +00:00
Jannis Leidel
a3894945b6 Fixed #15010 -- Added current_app parameter to close gap between TemplateResponse and render method. Thanks, acdha.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 22:41:43 +00:00
Jannis Leidel
093009bf1f Fixed #12959 -- Added alt text to SelectFilter filter button. Thanks, acdha.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 22:41:06 +00:00
Jannis Leidel
f2ae820d8b Fixed #12957 -- Added scope to the changelist tables for accessibility reasons. Thanks, acdha.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 22:40:45 +00:00
Jannis Leidel
a4dd476fc2 Fixed #6183 -- Stopped hiding the help text for SelectFilter widgets. Thanks, acdha.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 22:40:25 +00:00
Jannis Leidel
84660f0f3c Fixed #15023 -- Made US states list a tuple to be a bit more backwards compatible after r15058. Thanks, timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 22:40:01 +00:00
Jannis Leidel
465833834c Fixed a few docstrings and other helper texts in the staticfiles app.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 12:41:40 +00:00
Russell Keith-Magee
39b3269fec Corrected a test failure under Postgres caused by PK allocation. Thanks to Alex for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-04 05:57:32 +00:00
Luke Plant
c0dd2babb1 Fixed sending mail on 404s to fail silently.
A failure in the e-mail system should not turn a 404 into a 500.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-04 04:01:37 +00:00
Ramiro Morales
30fbe92ebf Fixed #11434 -- Corrected style of arrow buttons located at the center of filter_{horizontal|vertical} m2m widgets to not give them focus borders that span from the left page border. Thanks defaultwombat for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-04 01:26:50 +00:00
Ramiro Morales
efcaec1923 Fixed #11414 -- Made sure the calendar and clock popup windows in the admin don't have a negative vertical position. Thanks uipko for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-04 01:15:54 +00:00
Timo Graham
60470e8ac2 Fixed #10078 - Document use of locales in management commands. Thanks gregoire for the suggestion and ramiro for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 14:27:28 +00:00
Russell Keith-Magee
6bd8c14be9 Fixed #14999 -- Ensure that filters on local fields are allowed, and aren't caught as a security problem. Thanks to medhat for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:56:31 +00:00
Timo Graham
d41bd3f7f2 Fixed #14994 - Add attributes to example auth backend which would emit DeprecationWarning otherwise. Thanks kmike for the report and ojii for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:46:28 +00:00
Timo Graham
07ef43082d Fixed #15002 - Fix title casing to conform to style guidelines. thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:29:17 +00:00
Russell Keith-Magee
dc25fa776a Fixed #15006 -- Removed some stray tabs in python code. Thanks to vanschelven for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:19:59 +00:00
Russell Keith-Magee
a00e8d4e42 Fixed #14878 -- Clarified the way verbose_name_plural is used in generic list views as a context variable. Thanks to diegueus9 for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:15:58 +00:00
Russell Keith-Magee
2a5105ac15 Fixed #14973 -- Tweaked the email log handler so that the log message is actually reported.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 12:07:19 +00:00
Ramiro Morales
0f783b7f4e Fixed #2986 -- Made the JavaScript code that drives related model instance addition in a popup window handle a model representation containing new lines. Also, moved the escapejs functionality yoo django.utils.html so it can be used from Python code. Thanks andrewwatts for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 17:34:52 +00:00
Jannis Leidel
544ab30ed7 Fixed #6218 -- Made MEDIA_URL and STATIC_URL require a trailing slash to ensure there is a consistent way to combine paths in templates. Thanks to Michael Toomim, Chris Heisel and Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:33:11 +00:00
Jannis Leidel
7a89d3d503 Fixed #11700 -- Stopped admin actions and list_editable fields to show up in popups. Thanks to Simon Meers for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:32:40 +00:00
Jannis Leidel
be56f74f93 Fixed #14998 -- Made use of os.path.join to make sure this works on all platforms. Thanks for the pointer, CarlFK.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:32:17 +00:00
Jannis Leidel
e45d1e2dac Safely join paths in staticfiles finder.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:31:55 +00:00
Ramiro Morales
9c950db518 Fixed #11124 -- Expanded docstrings of the ModelAdmin has_{change|delete}_permission methods to make it clear they can be overriden to implement per-instance permission checks. Refs #12642.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-01 00:37:38 +00:00
Ramiro Morales
70c8cd4100 Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 23:02:07 +00:00
Luke Plant
5a36b43c27 Some small fixes to DB optimization docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 15:47:46 +00:00
Jannis Leidel
6c54bb72f0 Fixed the rest of the US localflavor tests that were forgotten in r15058. Refs r15029.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 14:38:19 +00:00
Jannis Leidel
d18d37ce29 Added our own rmtree error handler to make sure we can delete correctly delete .svn directories when running the tests on Windows which are read-only for some reason.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15120 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 14:22:55 +00:00
Jannis Leidel
0de63c96f2 Fixed #14961 -- Revised staticfiles's prefix handling to make sure it runs on Windows. Also revised staticfiles tests to pass on Windows.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 14:22:32 +00:00
Timo Graham
f2c4c63cdc Fixed #14997 - A typo in "Overriding delete". thanks phunehehe for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 13:09:20 +00:00
Timo Graham
aff5c467c1 Fixed #13912 - Fixed AliasMatch regex in modwsgi docs. Thanks SmileyChris for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-30 13:29:57 +00:00
Jannis Leidel
946e87ded1 Fixed #14990 -- Added sitemaps tests templates to manifest template.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-30 10:55:35 +00:00
Timo Graham
7902a89ced Fixed #12469 - Add a few clarifications to the ModelAdmin.get_urls() docs. Thanks benc for the suggestions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 21:50:40 +00:00