mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00
Code Issues 32 Releases Wiki Activity
861 Commits 29 Branches 451 Tags
Commit Graph

861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Kaplan-Moss
705a2c31c1 Fixed #604 - total number of objects in generic object_list view is now available as {{ hits }} 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-10 20:18:47 +00:00
Adrian Holovaty
29ff2bb4cb Improved django.core.management.get_sql_delete to close database connection explicitly when it's done, to avoid locking issues 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-10 20:14:56 +00:00
Adrian Holovaty
474cfe56d4 Fixed #601 -- Updated docs/model-api.txt unique_together section to say it's enforced at the database level. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-10 14:00:20 +00:00
Adrian Holovaty
b4e2d12b1f Fixed #599 -- locmem cache now uses deepcopy() to prevent aliasing. Thanks, Hugo 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-10 13:56:39 +00:00
Adrian Holovaty
f258a8fce2 Fixed #600 -- decorator_from_middleware now handles process_view. Thanks, Hugo 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-10 13:51:58 +00:00
Robert Wittams
0f338b8c2e merged to 818 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-10 13:21:30 +00:00
Robert Wittams
b335fab55e Small fixes: context for add_stage was wrong, and labels for booleans. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-10 13:12:53 +00:00
Robert Wittams
f114e652e3 clean up token parsing for error stuff and removed debug statements. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-09 14:40:10 +00:00
Adrian Holovaty
22bbdc633c Changed some formatting in docs/middleware.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-09 01:08:58 +00:00
Adrian Holovaty
fd4ddb179f Fixed ReST error in docs/cache.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-09 01:03:04 +00:00
Adrian Holovaty
df794701d0 Fixed small typo in docs/cache.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-09 01:02:30 +00:00
Adrian Holovaty
b6fd05e445 Added CACHE_MIDDLEWARE_KEY_PREFIX to global_settings 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-09 01:02:19 +00:00
Adrian Holovaty
d65526d688 Fixed #580 -- Added mega support for generating Vary headers, including some view decorators, and changed the CacheMiddleware to account for the Vary header. Also added GZipMiddleware and ConditionalGetMiddleware, which are no longer handled by CacheMiddleware itself. Also updated the cache.txt and middleware.txt docs. Thanks to Hugo and Sune for the excellent patches 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-09 00:55:08 +00:00
Adrian Holovaty
a5a89b5a43 Moved vary decorators from django.utils.cache to django.views.decorators.vary 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-09 00:37:56 +00:00
Adrian Holovaty
8aa98af6bb Added django.utils.cache, from Hugo's #580 patch. Refs #580. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-08 23:19:21 +00:00
Adrian Holovaty
71564b4349 Added django.utils.decorators, from Hugo's #580 patch. Refs #580. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-08 21:44:37 +00:00
Adrian Holovaty
a933432a70 Fixed #473 -- Added a MysqlDebugWrapper to use for MySQL with DEBUG=True. It displays more informative error messages for MySQL warnings. Thanks for the patch, mlambert@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-08 21:00:25 +00:00
Adrian Holovaty
b63abf0379 Fixed bug in tests/runtests.py -- some versions of MySQLdb require an argument to connection.autocommit() 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-08 20:56:34 +00:00
Adrian Holovaty
6beab20722 Fixed #374 -- Filtering by BooleanField now works in admin with SQLite. Thanks, davidschein 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-08 20:23:11 +00:00
Robert Wittams
0442a5440a Merged to r802 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-08 14:37:05 +00:00
Robert Wittams
5923c63c8d Fixed token parsing bug in the error stuff. 
Reorganisation and rationalisation of helper objects for admin templates. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-08 14:28:21 +00:00
Adrian Holovaty
d93c68ab5f Fixed #586 -- Fixed bug in raw_id_admin caused by [785]. Thanks for the heads-up, slashzero 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-07 23:39:06 +00:00
Robert Wittams
6e90c35b63 Remove 'intentional' error for error message testing ;-) 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-07 01:20:28 +00:00
Robert Wittams
c7d7e4cb78 Template fixes for inline tabular to let errors show up properly 
Typo fix for extends tag doc

Hugely improved messages for template syntax errors. 
Tokens and nodes are tagged with file and line numbers.
These are used in error messages. 

Example: 

TemplateSyntaxError: Unclosed tag 'if' starting at /usr/lib/python2.4/site-packages/django/conf/admin_templates/admin_submit_line.html, line 6. Looking for one of: else, endif 




git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-07 01:13:32 +00:00
Adrian Holovaty
9f7e2f38dd Fixed ReST formatting for docs/django-admin.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 17:29:59 +00:00
Adrian Holovaty
eaa8db131d Changed docs/django-admin.txt to add a link to diveintopython's explanation of Python import search path 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 17:27:13 +00:00
Adrian Holovaty
c8930e3af4 Fixed #357 -- Added a '--pythonpath' option to django-admin. Thanks for the patch, Hugo 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 17:22:23 +00:00
Adrian Holovaty
485042b74d Fixed #595 -- Fixed error when sorting API results descending with custom 'select' parameters. Thanks for the patch, Robert Wittams 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 15:52:30 +00:00
Robert Wittams
f9e1deb8b3 Merged to r789 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 14:49:22 +00:00
Adrian Holovaty
9fe02e6b65 Made raw_id_admin work with non-integer primary keys 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 14:43:07 +00:00
Adrian Holovaty
cb628c0cb7 Changed django.core.management to remove a couple of hard-coded slashes from os.path.join calls. Thanks, Stuart Langridge 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 14:30:35 +00:00
Adrian Holovaty
ab9aacd4db Fixed #333 and #440 -- Split DEFAULT_MIME_TYPE setting into DEFAULT_CONTENT_TYPE and DEFAULT_CHARSET. Thanks, Maniac. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 02:27:08 +00:00
Adrian Holovaty
261ab166ce Fixed #586 -- raw_id_admin now works with non-integer primary keys 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 01:51:30 +00:00
Adrian Holovaty
8dda2aeaa3 Improved model validator to check admin.list_filter and type-check admin.list_display 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 01:41:54 +00:00
Robert Wittams
0b8ce51ce6 small change to undo javascript testing modification 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-06 00:06:47 +00:00
Adrian Holovaty
c3fa47edb8 Added USE_FLAT_PAGES setting, which defaults to True. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-05 23:36:17 +00:00
Adrian Holovaty
16f9b08611 Clarified get_FOO_list part of docs/db-api.txt to specify keyword arguments are also accepted 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-05 22:47:36 +00:00
Robert Wittams
e3f3d4e86f Merged to r778. Added template tag decorators: 
* simple_tag : transforms a function outputting a string into a tag. 
                arguments are converted into tag arguments, and defaults are 
                supported. 
 * inclusion_tag : transforms a function outputting a dictionary into a tag 
                which renders an included template. The name of the template is
                given as an argument to the decorator, and the dictionary 
                returnd by the function is used to populate the context 
                to render the included template. The template is loaded at
                compile time, and the nodelist cached. 

Also made the {%include %} tag load the template at compile time if the argument is a constant string.  


git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-05 21:41:41 +00:00
Jacob Kaplan-Moss
837afc5a29 Changed default JING_PATH setting to be something that might actually be useful. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-04 18:05:37 +00:00
Robert Wittams
555502e208 Added templates for 'funny' widgets here: django/conf/admin_templates/widget 
Added a follow argument to manipulators. This allows you to exclude/include fields and related objects ( recursively), defaulting to current behaviour, meaning that forms can modify a subset of fields. This should fix #445. Fixed update generic view to use this (will change others soon).  Merged to trunk r772. 



git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-04 16:35:39 +00:00
Adrian Holovaty
78b8fcc235 Fixed typo in docs/outputting_pdf.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-04 15:17:22 +00:00
Adrian Holovaty
6f07f717c0 Fixed #591 -- fixed typo in docs/templates_python.txt. Thanks, Boffbowsh 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-04 13:34:59 +00:00
Robert Wittams
1c9cf48651 Undo bad fix for #684 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-02 18:08:01 +00:00
Robert Wittams
cfe2e95529 Merge to r764. Fix 684, also allow overloading indivual fields templates in the admin. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-02 17:55:03 +00:00
Adrian Holovaty
da71528717 Added missing period to docs/outputting_pdf.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-30 22:07:19 +00:00
Adrian Holovaty
53581d6d8d Small tweak to docs/outputting_pdf.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-30 22:05:44 +00:00
Adrian Holovaty
a0595851b6 Added docs/outputting_pdf.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-30 22:02:51 +00:00
Robert Wittams
3afc81d44e merged r741:748 into new-admin 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-30 17:26:00 +00:00
Robert Wittams
e6c080db2b Possible fix for #499. Also gets error handling working properly in the admin without changing field names. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-30 17:17:50 +00:00
Adrian Holovaty
7cc9526b2e Fixed typo in docs/tutorial01.txt. Thanks, Aggelos Orfanakos 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-30 16:40:15 +00:00