mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity
1,224 Commits 29 Branches 451 Tags
Commit Graph

1224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Wittams
a4ce9cf2ce Synced to trunk. Fixed views/decorators/auth.py. Added extra customisation points to admin change_forms. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-23 15:45:02 +00:00
Adrian Holovaty
17f62269c2 Fixed #479 -- Implemented time-zone formats in dateformat. Thanks, Sune 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-22 21:37:59 +00:00
Adrian Holovaty
f82e64c6b2 Fixed #681 -- get_in_bulk no longer assumes PK fields are called id. Also added unit tests to confirm. Thanks, Jeremy Dunck 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-22 21:18:53 +00:00
Adrian Holovaty
411625a761 Some small improvements and fixes to docs/authentication.txt, which still isn't finished 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-22 00:18:39 +00:00
Adrian Holovaty
d412dbf46b Added partially completed docs/authentication.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-22 00:12:56 +00:00
Adrian Holovaty
4f47ef85f8 Added django.views.decorators.auth.user_passes_test, which is a more generic hook into authentication based on a test. Refactored login_required to use user_passes_test 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-22 00:04:55 +00:00
Robert Wittams
3bcc7ea82e Merged to trunk r985 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 23:40:10 +00:00
Robert Wittams
c40fd89b1a Changed how edit_inline works in the admin. Now it is done by a subclass of BoundRelatedObject. 
This means anyone using edit_inline="path/to/template" will need to subclass this ( or 
TabularBoundRelatedObject or StackedBoundRelatedObject). The functionality may be restored if 
it becomes obvious exactly what information should be available to these templates; before it 
was kind of random. 

So you can do 
class MyBoundRelatedObject(TabularBoundRelatedObject):
	def template_name(self):
	    return "path/to/template"

and then edit_inline=MyBoundRelatedObject to duplicate the previous functionality. 



git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 23:27:27 +00:00
Adrian Holovaty
cc3635d62f Fixed #663 -- app_directories template loader no longer assumes a dot in the app name. Thanks, Sune 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 23:16:45 +00:00
Adrian Holovaty
81cbf27a13 Fixed #668 -- Changed default site from mysite.com to example.com. Thanks, Ian 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 22:58:33 +00:00
Adrian Holovaty
3e7ea41bbb Added note about ALLOWED_INCLUDE_ROOTS to docs/templates.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 21:58:01 +00:00
Robert Wittams
bd47a97997 Rationalised related object methods 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 19:07:15 +00:00
Robert Wittams
5d74e282a4 Cleanups of whitespace changes and errors after big merge 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 15:55:45 +00:00
Robert Wittams
b0ad6b878e merged to r979 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 15:05:39 +00:00
Adrian Holovaty
169f9d2bd3 Fixed #655 -- Improved 'validator_list' section of docs/model-api.txt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 13:22:20 +00:00
Adrian Holovaty
d8b8367494 Fixed #658 -- Fixed JavaScript calendar widget in IE. Thanks for the patch, kieranholland 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 13:16:46 +00:00
Adrian Holovaty
a102942d7a Fixed #654 -- Fixed bug in [969]. Thanks, korpios@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 13:13:55 +00:00
Robert Wittams
6712860752 Merged to trunk r972 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 12:02:51 +00:00
Robert Wittams
34ab88b046 Fix for doc view in admin due to merge. Thanks Ian. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 11:56:34 +00:00
Adrian Holovaty
e4c844ffa0 Fixed #653 -- setup.up now accounts for admin file moves. Thanks, korpios@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 05:35:33 +00:00
Adrian Holovaty
62db7c5c94 Fixed another ReST bug in template docs from [969] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 05:32:49 +00:00
Adrian Holovaty
81fd300a4e Fixed ReST bug in template docs from [969] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 05:31:54 +00:00
Adrian Holovaty
4c327b9c86 Lightly refactored django.utils.dateformat to make it use less code. Also integrated some of Sune's improvements from the #479 patch, including support for backslash escaping. Also vastly improved template docs for the {% now %} tag 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 05:30:11 +00:00
Adrian Holovaty
539e53ccf1 Fixed #317 -- SlugField now accepts hyphens. Thanks, Sune 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 04:20:52 +00:00
Adrian Holovaty
bf5dce64de Fixed #642 -- Added small improvement to EmailField docs. Thanks, Boffbowsh 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 04:03:41 +00:00
Robert Wittams
c93fa6e39b Merged to r960. Nightmare. Removed old view functions in admin. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-20 00:15:01 +00:00
Adrian Holovaty
989fcce02a Fixed template-name bug for admin doc templates in [948] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 16:29:20 +00:00
Adrian Holovaty
9de01b157f Removed duplicate LANGUAGE_CODE from project_template/settings. Thanks, EspenG 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 16:10:31 +00:00
Adrian Holovaty
56022ea314 Added TIME_ZONE and LANGUAGE_CODE to stock settings file created by 'django-admin startproject 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 16:03:24 +00:00
Adrian Holovaty
ed2f2419a1 Fixed #647 -- Fixed cache middleware not to expect _cache_update_cache, in case of 404s and 500s. Thanks, Eugene 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 13:44:55 +00:00
Robert Wittams
8fb86e60a1 Add forgotten 'template_debug' template 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 09:22:50 +00:00
Adrian Holovaty
d8632868f9 Removed django.conf.admin_templates. Refs #627 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 01:22:18 +00:00
Adrian Holovaty
c548955d29 Fixed admin template bug from [948] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 01:18:53 +00:00
Adrian Holovaty
d7a69df1b6 Fixed ReST bug in docs/tutorial02.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 01:17:13 +00:00
Adrian Holovaty
079752fe88 Fixed #641 -- Fixed re-raise in django.core.handlers.base. Thanks, Sune 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 01:16:57 +00:00
Adrian Holovaty
f07e5d4f5d Fixed #627 -- BACKWARDS-INCOMPATIBLE CHANGE. Admin is now an app, not a middleware. See BackwardsIncompatibleChanges for a full list of changes and information on how to update your code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 01:09:05 +00:00
Robert Wittams
8694d4b7b8 Added TemplateDebugMiddleware. This intercepts TemplateSyntaxErrors that have been annotated with origin information and highlights where the problems are. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-19 00:19:47 +00:00
Adrian Holovaty
fd3d579179 Added django.contrib.admin.templatetags. Refs #627 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 23:15:47 +00:00
Adrian Holovaty
0dc843b3c6 Added contrib.admin.models.admin, which contains LogEntry (from models.auth). It still exists in models.auth, temporarily 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 22:55:23 +00:00
Robert Wittams
16d966a163 Merged to 940 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 16:02:53 +00:00
Adrian Holovaty
30d7e62828 Fixed ReST bug in docs/model-api.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 15:59:06 +00:00
Robert Wittams
1819b38ae3 Fixes for inline editing with custom follow. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 15:58:54 +00:00
Adrian Holovaty
1bb40e75c7 Removed legacy TODO comment from django.models.auth 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 15:41:45 +00:00
Adrian Holovaty
1f227df92b Added DATA_TYPES_REVERSE to ado_mssql backend 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 14:33:32 +00:00
Adrian Holovaty
8863e5dd11 Changed get_random_function_sql for ado_mssql backend to use RAND(), which is correct. Thanks, Jakub Labath 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 14:02:46 +00:00
Adrian Holovaty
b890e37ada Added get_table_list() to ado_mssql backend 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 13:59:58 +00:00
Robert Wittams
913d792878 Merged to r631. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 12:39:07 +00:00
Adrian Holovaty
d5f32aa008 Changed contrib.admin.views.main to use staff_member_required_decorator. Refs #627. Note that, by this point, AdminUserRequired middleware is redundant -- but nothing is backwards-incompatible yet. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 05:23:07 +00:00
Adrian Holovaty
c2ffd62d89 Changed django.contrib.admin.views.main to use template.loader instead of template_loader 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 05:18:50 +00:00
Adrian Holovaty
15fb988dbc Changed contrib.admin.views.template and doc to use staff_member_required decorator. Refs #627 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-18 05:12:45 +00:00