Commit Graph

271 Commits

Author SHA1 Message Date
Malcolm Tredinnick 25c4ab99e3 Fixed #6109 -- Marked fieldset descriptions as safe from auto-escaping. Good
catch, SomeGuy.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-03 07:39:10 +00:00
Gary Wilson Jr a01ebb4a50 Fixed #6354 -- Fixed url in `django/conf/urls/shortcut.py` to work with non-integer primary keys (refs #2033) and made use of the URL file in the admin urls.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-28 05:36:44 +00:00
Malcolm Tredinnick d1793f1774 Fixed #6248 -- Fixed typo in urlify.js. Pointed out by arien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-06 03:55:23 +00:00
Malcolm Tredinnick 402ca0b77b Fixed #5044 -- Added Latvian character map for Javascript slug generation. Patch from arien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-17 09:14:59 +00:00
Jacob Kaplan-Moss 76dd53ac08 Fixed #6116: mark-safe the admin changelist table class. Thanks, zlobnyi antisvin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-04 19:17:25 +00:00
Malcolm Tredinnick f27365e5bd Fixed #6061 -- Don't escape help_text in the admin interface (so that it
behaves as documented). Thanks, baumer.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-30 19:59:13 +00:00
Malcolm Tredinnick 0171f00761 Fixed #5706 -- Fixed a couple of XHTML incompatibilities. Based on a patch from
tvrg.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-29 16:32:29 +00:00
Malcolm Tredinnick 2d0d6620e6 Fixed #6015 -- Fixed a CSS escaping issue for admin's edit-inline.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-28 17:58:10 +00:00
Gary Wilson Jr 183a457f5a Fixed #2086 -- Changed `base.css` to import `null.css` (added in [6197]) instead of `null`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-25 20:29:26 +00:00
Malcolm Tredinnick ab69710de4 Fixed #5976 -- Handle auto-escaping correctly for empty columns in admin change
view.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-20 01:37:34 +00:00
Malcolm Tredinnick b1d40295bc Fixed #5973 -- Fixed inadvertent allow_tags=True auto-escaping problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-20 01:37:01 +00:00
Gary Wilson Jr 38d972b9ec Fixed #5880 -- Fixed an XSS hole in the admin interface.
* Escaped text that gets sent after saving the admin foreignkey popup form.
 * Added quotes around the second argument passed to `opener.dismissAddAnotherPopup` to make the function also work when a text field is used as the primary key.
 * Added a `html_unescape` javascript function to unescape the strings passed in to the `dismissAddAnotherPopup` function so that the added choice displays correctly in the dropdown box.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-18 06:51:20 +00:00
Malcolm Tredinnick b58c55fc80 Fixed #5944 -- Added safe string markings to admin error messages in one place
that was missed.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14 22:58:24 +00:00
Malcolm Tredinnick 356662cf74 Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359
See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14 12:58:53 +00:00
Malcolm Tredinnick 4362d154fb Fixed #4902 -- Added some missing Czech uppercase characters to urlify.js.
Thanks, michal@plovarna.cz.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-10-20 09:27:12 +00:00
Malcolm Tredinnick dc9def7859 Fixed #5678 -- Added Polish transliteration to urlify.js. Thanks,
regexbot@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-10-20 04:42:30 +00:00
Jacob Kaplan-Moss 2570954a9a Fixed #3453: introduced a new template variable resolution system by Brian Harring (thanks!). The upshot is that variable resolution is about 25% faster, and you should see a measurable performance increase any time you've got long or deeply nested loops.
Variable resolution has changed behind the scenes -- see the note in templates_python.txt -- but template.resolve_variable() still exists. This should be fully backwards-compatible.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-21 04:00:32 +00:00
Gary Wilson Jr 04a110836d Fixed #3491 -- Fixed links in `user-tools` section of admin's `base.html` template to use the `url` template tag. This also removes the need for child templates to override the block just to adjust the relative path. Thanks, saintsjd@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-20 06:59:13 +00:00
Malcolm Tredinnick e9656180ea Fixed #1394 -- Fixed an admin crash when saving models with pk db column != pk attname.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-16 12:14:48 +00:00
Malcolm Tredinnick 4b610f42d3 Added a get_host() method to HttpRequest. There is still an http.get_host() version in place, so this is fully backwards compatible.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-15 17:46:03 +00:00
Adrian Holovaty 5c3905cf48 Fixed #1888 -- Fixed small interface inaccuracy when using filter_interface=models.VERTICAL. Thanks, ryankanno, wnielson and SmileyChris
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-15 05:01:58 +00:00
Jacob Kaplan-Moss 66e4541101 Fixed #4448: the calendar widget now refreshes if the date field is changed. THanks, gkelly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-14 21:04:45 +00:00
Wilson Miner 1ea702dd23 Fixed 3136: Set .clockbox admin widget to auto width to allow for longer headers in other languages.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6210 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-14 19:49:51 +00:00
Wilson Miner 55d34c6cb3 Fixes #2086: Added null.css file to avoid spurious 404s due to the "high pass filter" which hides admin CSS from IE5/Win.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-14 18:26:05 +00:00
Russell Keith-Magee 3358e2fec7 Fixed #5067 -- Fixed a problem with javascript popup widgets appearing in the wrong place if they were in a overflow=scroll block. Thanks to Erich Schmid for the original fix, and Robert Coup for the updated patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-14 06:43:46 +00:00
Russell Keith-Magee 09145d2e5f Fixed #208 -- Modernized the syntax of the cycle tag to allow for spaces and variables in cycle values. Thanks to SmileyChris and Chris McAvoy for their work on this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-14 02:49:21 +00:00
Malcolm Tredinnick a7d0ad67dc Fixed #5326 -- Added Ukrainian map for Javascript slug generation. Thanks, Artyom Gnilov.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-13 22:42:30 +00:00
Adrian Holovaty 70740d6eca Fixed #348 -- Fixed bug in admin JavaScript filter interface. Thanks for the patch, Gary Wilson
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-25 23:33:58 +00:00
Malcolm Tredinnick a901af5f58 Fixed #5155 -- Translated the model name (when available) in the Recent Actions log.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-19 05:40:47 +00:00
Adrian Holovaty 9ee6326cb6 Fixed #5019 -- Fixed broken links in navigation of 'change password' admin page. Thanks, hpxchan@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-12 03:26:35 +00:00
Malcolm Tredinnick 35ce8a2a8a Fixed #4902 -- Added Czech support to urlify.js. Thanks, Honza Král.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-11 12:09:52 +00:00
Gary Wilson Jr 212ee65be7 Fixed #2101 -- Renamed `maxlength` argument to `max_length` for oldforms `FormField`s and db model `Field`s. This is fully backwards compatible at the moment since the legacy `maxlength` argument is still supported. Using `maxlength` will, however, issue a `PendingDeprecationWarning` when used.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-05 05:14:46 +00:00
Gary Wilson Jr 919205ef85 Refs #3397 -- Corrected the Exception that is caught when ordering by non-fields (added in [4596]), thanks glin@seznam.cz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-04 14:41:49 +00:00
Malcolm Tredinnick f2a45f9b38 Fixed #4862 -- Fixed invalid Javascript creation in popup windows in admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-14 13:14:28 +00:00
Malcolm Tredinnick 92ee770773 Fixed #4556 -- Stylistic changes to [5500]. Thanks, glin@seznam.cz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-13 14:40:39 +00:00
Malcolm Tredinnick 0145e71ceb Fixed #4846 -- Fixed some Python 2.3 encoding problems in the admin interface.
Based on a patch from daybreaker12@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-13 11:05:01 +00:00
Russell Keith-Magee 4d9e29ea86 Fixed #4775 -- Added some missing Hungarian accents to the urlify.js LATIN_MAP. Thanks, Pistahh <szekeres@iii.hu>.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-12 14:00:13 +00:00
Malcolm Tredinnick fbd9381802 Fixed #4766 -- Added Russian support to Javascript slug creation. Thanks,
boobsd@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 12:31:19 +00:00
Malcolm Tredinnick f0250b64f6 Fixed Javascript syntax from [5608] that was causing a problem in Opera. Fixed
#4365.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 12:25:43 +00:00
Malcolm Tredinnick 953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 12:11:04 +00:00
Malcolm Tredinnick ac64e91a0c Merged boulder-oracle-sprint branch (r3965:5512) back into trunk. All
expected tests pass for all databases.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-23 14:16:00 +00:00
Malcolm Tredinnick 08aa5c585b Fixed #4607 -- Tweaked checks for features missing in Python 2.3 to not assume
things Python does not guarantee. Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-23 03:18:22 +00:00
Malcolm Tredinnick 880e3cfaa6 Backed out the changes in [5482] for a bit whilst some more investigation into
side-effects is done. Refs #4565.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-22 07:15:04 +00:00
Adrian Holovaty 11a8084d4f Fixed #4556 -- Admin showAddAnotherPopup JavaScript function can now handle URLs with GET attributes. Thanks for the patch, glin@seznam.cz
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-20 06:12:43 +00:00
Malcolm Tredinnick bccb8897e6 Fixed #4565 -- Changed template rendering to use iterators, rather than
creating large strings, as much as possible. This is all backwards compatible.
Thanks, Brian Harring.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-17 07:11:37 +00:00
Jacob Kaplan-Moss 1e70426619 Fixed #3397 (again): admin_order_field is now displayed correctly in the admin views. Thanks, kent37@tds.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-05-22 16:56:53 +00:00
Malcolm Tredinnick 92c35a0617 Fixed #2365, #3324 -- Renamed FloatField to DecimalField and changed the code
to return Decimal instances in Python for this field. Backwards incompatible
change.

Added a real FloatField (stores floats in the database) and support for
FloatField and DecimalField in newforms (analogous to IntegerField).

Included decimal.py module (as django.utils._decimal) from Python 2.4. This is
license compatible with Django and included for Python 2.3 compatibility only.

Large portions of this work are based on patches from Andy Durdin and Jorge
Gajon.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@5302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-05-21 01:29:58 +00:00
Malcolm Tredinnick d1b0d34dc6 Fixed #4200 -- Made get_admin_log template tag behave according to its
docstring (user specifier is optional). Thanks, Bryan Chow.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-05-08 03:56:44 +00:00
Malcolm Tredinnick 4bce3c17ec Revert [5092], since this should only have been applied to newforms-admin.
Refs #1576.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-26 14:58:38 +00:00
Malcolm Tredinnick 6c18ba8c91 Fixed #1576 -- Fixed incorrect SQL generated when using descending ordering
from related models. Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-26 13:48:31 +00:00