1
0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Commit Graph

3214 Commits

Author SHA1 Message Date
Malcolm Tredinnick
a0c354ee4e Fixed #3351 -- Added optional naming of the block in "endblock" tags to ensure
correct nesting. Thanks for the patch, SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-12 00:22:22 +00:00
Malcolm Tredinnick
d123588184 #fixed #2256 -- Made count() interact with slicing on QuerySets. Patch from
SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-12 00:16:17 +00:00
Malcolm Tredinnick
80e58b3211 Fixed #2315 -- added work around for Windows timezone setting (i.e. we can't do
it). This will work until somebody wants to write some full Win32 timezone changing code for us. Thanks to Marc Fargas and SmileyChris for the combined patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-12 00:10:09 +00:00
Malcolm Tredinnick
6c4757729b Revert [4485] in order to fix accidental mod_python breakage. Refs #2920.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-11 23:50:35 +00:00
Russell Keith-Magee
0e924c70b1 Refs #2920 -- Replaced implicit uses of _() with explicit imports or calls to gettext(). At some point post 0.96, we need to remove the calls that put _ into the builtins.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-11 06:20:52 +00:00
Adrian Holovaty
b767b5831d Made negligible change to docs/django-admin.txt -- 'MS Windows' to 'Windows'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-11 04:39:23 +00:00
Adrian Holovaty
8369240138 Made negligible change to docs/contributing.txt -- 'MS Windows' to 'Windows'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-11 04:38:44 +00:00
Russell Keith-Magee
f9cdde0cb4 Fixed #3162 -- Added coded to catch and rethrow exceptions that are thrown by the views visited by the test client. Thanks, Ben <afternoon@uk2.net>.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-11 00:23:31 +00:00
Malcolm Tredinnick
23272de5db Fixed #3159 -- documented how to work around a lack of symlinking functionality
on Windows (with respect to django-admin.py).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 09:07:54 +00:00
Malcolm Tredinnick
4d75c7aa6e Fixed #3071 -- added a {{{__contains__}}} method to the Context class. Thanks
akaihola.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 09:02:00 +00:00
Malcolm Tredinnick
d8deb0c61c Fixed #3147 -- documented how to use .pth files for easy switching between
different versions of the code. Thanks to Waylan Limberg for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 08:55:18 +00:00
Malcolm Tredinnick
937f3190ba Fixed #2762 -- added copyright element support to RSS and Atom feeds. Patch
from Jonathan Buchanan.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 08:36:39 +00:00
Malcolm Tredinnick
fefcbbfe37 Fixed #2655 -- added documentation about resolve_variable() for custom template
tags. Thanks dave@thebarproject.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 08:29:34 +00:00
Adrian Holovaty
007f17d63e Fixed #3463 -- EmptyQuerySet's iterator() now returns a generator. Thanks, Gary Wilson
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 05:38:38 +00:00
Malcolm Tredinnick
1aa1c4672c Added some documentation for truncatewords_html (added in [4468]).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 05:22:12 +00:00
Adrian Holovaty
766e339666 Improved runtests.py to normalize MIDDLEWARE_CLASSES during test execution. Some tests were failing for me because my custom MIDDLEWARE_CLASSES setting didn't have sessions or authentication installed
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 04:01:19 +00:00
Adrian Holovaty
ae36e6303d Fixed #3437 -- Fixed incorrect logic in django.http.HttpResponse calculation of _is_string. Thanks, Brian Harring
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 03:56:21 +00:00
Adrian Holovaty
45e0a522bb Fixed ReST bug in docs/fastcgi.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 03:42:24 +00:00
Malcolm Tredinnick
e57ce6b157 Fixed #2348 -- Improved error reporting when query filter arguments are
misspelt. Variation on a patch from Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 03:39:56 +00:00
Adrian Holovaty
f0a3f5fc1a Updated reportlab user guide link in docs/outputting_pdf.txt. Thanks, Derek Lee-Wo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 03:39:14 +00:00
Malcolm Tredinnick
5a0b72a6eb Fixed #2027 -- added truncatewords_html filter that respects HTML tags whilst
truncating. Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 02:51:27 +00:00
Malcolm Tredinnick
2a14daffb0 Fixed #3443 -- Updated Joe Heck's entry.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 00:55:33 +00:00
Malcolm Tredinnick
ea7b3fd148 Fixed #3449 -- fixed regression test results so that they all pass now. Thanks
Brian Harring.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-09 22:09:07 +00:00
Malcolm Tredinnick
9b129b8f3f Fixed #3468 -- fixed typo in VariableDoesNotExist.__str__. Pointed out by
Herbert Poul.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-09 22:01:13 +00:00
Russell Keith-Magee
9ba27afce0 Added a `session` attribute to the test Client, to make it easier to test if session variables have been modified in a view. Also renamed Client.cookie to Client.cookies, to match documentation and common sense.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-09 13:47:36 +00:00
Russell Keith-Magee
4ccdf127d0 Fixes #3447, Refs #2160 -- Reverting change [4459] because it breaks admin. Apologies for the inconvenience, guys.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-07 22:56:53 +00:00
Jacob Kaplan-Moss
f28558348b Trivial whitespace chance to AUTHORS to test the trac commit hook. Refs #1 also for testing, but it doesn't really.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-06 14:09:05 +00:00
Jacob Kaplan-Moss
b5f9176115 Fixed #3441: VariableDoesNotExist is now a bit lazier about rendering its error message. Thanks, Brian Harring.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-06 13:59:24 +00:00
Adrian Holovaty
04c4a031ba newforms: Changed ChoiceField error message *not* to include user-provided input
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-05 21:26:57 +00:00
Russell Keith-Magee
795de3a67c Fixed #2160 -- Modified object save logic to check for `pk is None, rather than bool(pk) == False`. This allows primary keys to take a value of 0. Thanks for the report, fgutierrez@aureal.com.pe.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-04 00:54:30 +00:00
Jacob Kaplan-Moss
695302ce92 Fixed #3320: upgraded django.utils.simplejson to simplejson version 1.5. Thanks, Lawrence Oluyede.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-30 22:34:15 +00:00
Jacob Kaplan-Moss
1e3d035fcc Fixed Python 2.4-ism in modeltests/test_client. Thanks for the find, Robert Myers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-29 16:48:31 +00:00
Adrian Holovaty
5aea495ac3 Improved newforms.models.save_for_instance() to set many-to-many values via ID instead of instance, to save on a database query, thanks to [4448]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-29 16:12:17 +00:00
Adrian Holovaty
d28a63cc00 Fixed #3389 -- Many-to-many sets can now be assigned with primary key values
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-29 16:09:25 +00:00
Adrian Holovaty
a031cadf4e Fixed #3385 -- Fixed broken link in docs/design_philosophies.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-29 00:25:14 +00:00
Adrian Holovaty
829e4c70f8 newforms: Changed database Field formfield() methods to pass help_text to the formfield help_text
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-28 22:36:02 +00:00
Adrian Holovaty
cf75fcc832 Fixed #3255 -- Added help_text argument to newforms Field class.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-28 22:10:04 +00:00
Adrian Holovaty
83768bf067 Fixed #3263 -- newforms form_for_model() and form_for_instance() now handle foreign-key and many-to-many data properly. Thanks for the patch, Jeff Hilyard
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-28 04:56:54 +00:00
Adrian Holovaty
546f16d323 newforms: Added a unit test that tests dynamic field addition with base fields defined on the class
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-27 22:16:16 +00:00
Adrian Holovaty
c93686c698 Fixed #3334 -- Changed newforms Form class construction so that appending to (or altering) self.fields affects only the instance, not the class. As a consequence, self.fields is created in Form.__init__(). The form metaclass now creates a variable self.base_fields instead of self.fields.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-27 22:06:56 +00:00
Adrian Holovaty
c0e01416b6 Fixed #3312 -- CheckboxSelectMultiple no longer uses duplicate ID attributes for each checkbox
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-27 21:41:32 +00:00
Adrian Holovaty
982a9443e1 Fixed #3300 -- Changed newforms Select widget to collapse 'choices' into a list if it's an iterable, so the iterable can be iterated over multiple times.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-27 21:30:26 +00:00
Russell Keith-Magee
db8525cc01 Fixed a flaw in the serializers that prevented OneToOneFields being serialized as JSON objects.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-27 13:42:51 +00:00
Russell Keith-Magee
54feaca70f Fixed #3098 -- Added db_table parameter to m2m fields, allowing the specification of a custom table name for the m2m table. Thanks, Wolfram Kriesing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-25 13:47:55 +00:00
Russell Keith-Magee
12ad69c0b4 Fixed #3215, #3081, #2749 -- Fixed problem with mistaken deletion of objects when a GenericRelation is involved. Thanks to Thomas Steinacher for helping to narrow down the problem (#3215), and Alex Dedul (#3081) for the starting point of a working patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-25 11:24:17 +00:00
Adrian Holovaty
dfee6b328e Fixed #3302 -- Added small note to docs/django-admin.txt about ordering of initial-data SQL files
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-25 00:53:30 +00:00
Adrian Holovaty
de60cf04d0 Fixed #3299 -- Added 'site' to the list of INVALID_PROJECT_NAMES and improved the error message. Thanks for the patch, ubernostrum
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-25 00:52:05 +00:00
Adrian Holovaty
9d94355885 Fixed #2133 -- Invalid session cookie no longer causes fatal error. Thanks, greg-django@abbas.org
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-25 00:47:44 +00:00
Adrian Holovaty
81c839014d Fixed #1336 -- USStateField no longer throws exception when data is None
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-25 00:43:44 +00:00
Adrian Holovaty
1b0b3febe1 Fixed ReST error in docs/contributing.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-24 20:11:54 +00:00