mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-17 18:59:14 +00:00
Code Issues 32 Releases Wiki Activity
1,118 Commits 30 Branches 459 Tags
Commit Graph

90 Commits

Author SHA1 Message Date
Robert Wittams
e66c99a356 Merged to trunk r1320 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-21 01:15:00 +00:00
Adrian Holovaty
9347f748b0 Added an EmailField to the many_to_one API tests 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1315 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-20 22:40:46 +00:00
Adrian Holovaty
887ed3ad2c Changed one_to_one unit test to use %r instead of %s in repr method 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-20 22:17:00 +00:00
Robert Wittams
3da16d2d25 Merged to trunk r1281 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-18 17:10:19 +00:00
Georg Bauer
3478fb51d6 fixed two failing i18n tests - they only failed when using ./runtests, now they work both ways. And template tests give tracebacks when they fail. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-17 15:55:04 +00:00
Robert Wittams
35d90bfdc7 Merged to trunk r1234 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-15 01:36:12 +00:00
Adrian Holovaty
f6bf41e59a Fixed #121 -- Django now quotes all names in SQL queries. Also added unit tests to confirm. Thanks, Robin Munn and Sune. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-14 01:44:35 +00:00
Robert Wittams
6df743f870 Merged to trunk r1158 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-11 00:18:10 +00:00
Adrian Holovaty
e3e37ed120 Fixed #724 -- Ensured get_next_by_FOO() and get_previous_by_FOO() methods don't skip or duplicate any records in the case of duplicate values. Thanks for reporting the bug, mattycakes@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-10 05:36:41 +00:00
Robert Wittams
dbaf9c6f8d Merged to trunk r1152 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-10 00:49:29 +00:00
Adrian Holovaty
28bce49e59 Added unit tests to disprove #724 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-10 00:03:53 +00:00
Adrian Holovaty
133e9e9639 Added unit tests to confirm #683 -- a new custom_columns model example 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-09 21:56:05 +00:00
Adrian Holovaty
2a149e29b8 Fixed dateformat unit test that was failing -- the test was incorrect. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-09 20:41:18 +00:00
Adrian Holovaty
ba87f474dc Changed dateformat unit tests so that they use the en-us language. They were failing because they depended on the current user's LANGUAGE_CODE setting 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-09 20:36:23 +00:00
Robert Wittams
5abf214ea6 merged to trunk r1124 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-08 15:16:12 +00:00
Robert Wittams
fdaad9ea27 Merged i18n from trunk . To r1068. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-04 13:04:07 +00:00
Jacob Kaplan-Moss
5cf8f68423 Merged i18n branch into the trunk! Fixes #65, and perhaps some others. NB: this means that the i18n branch is now obsolete and will be made read-only. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-04 04:59:46 +00:00
Robert Wittams
204443cf4c Merged to trunk r1039 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-01 15:15:09 +00:00
Robert Wittams
18f43e5421 Regex based filter profiler. 150% -> 170% speed up of parsing a filter. Also preserves i18n behaviour from i18n branch. 
Fix for auto populated field js and setup.py


git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-01 15:11:28 +00:00
Adrian Holovaty
3226127aa2 Added model unit tests for year, month and day lookup. Refs #659 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-01 00:40:32 +00:00
Robert Wittams
5e5f77f59b Merged to 1021. 
Initial split up of change lists to tags and templates. Needs work. 

Rationalised related object methods. 

Various bug fixes. 

A lot of changes here, so please let me know of any issues. 
Also I would appreciate examples of models with funky list views, 
eg searchs, pagination, filtering etc. 



git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-30 14:18:28 +00:00
Adrian Holovaty
e0d2793b7b Fixed #687 -- Fixed bug in floatformat template filter and added unit tests. Thanks, Sune 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-25 01:44:14 +00:00
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
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
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
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
Robert Wittams
692d1332f9 Cleanups of old debug bits. Fully clean DebugLexer. 
Reverted some testing changes. 



git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-17 14:26:41 +00:00
Robert Wittams
afda16b5ab Removed debug cruft 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-15 23:12:27 +00:00
Robert Wittams
e84be6ffa3 Merged to r880. Fixed lexing bug in DebugLexer. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-15 23:10:35 +00:00
Robert Wittams
930f8ee99f Merged to r670. Moved decorators. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-14 23:53:03 +00:00
Adrian Holovaty
6ee014725e Changed template unit test runner to use new template-loader framework from [870] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-14 22:28:38 +00:00
Adrian Holovaty
f71f854628 Fixed #626 -- Moved template modules to django.core.template package. django.core.template_loader is deprecated, in favor of django.core.template.loader. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-10-14 20:10:13 +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
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
Robert Wittams
eb07d93938 Merged trunk changes, and converted submit lines to use a template 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-30 13:39:24 +00:00
Robert Wittams
d0ba57ee90 Initial checkin of new admin branch. Ticket #535. I've tried to cover the changes below, but may have forgotten some. 
M      django/conf/urls/admin.py
Modified to allow running the old and new code in parallel. Simply add _old on the end of a change or add form to check against the behaviour of the old admin. 
eg http://myadmin/auth/users/1/ -> http://myadmin/auth/users/1_old/

A      django/conf/admin_templates/admin_change_form.html
A      django/conf/admin_templates/admin_edit_inline_stacked.html
A      django/conf/admin_templates/admin_field.html
A      django/conf/admin_templates/admin_field_widget.html
A      django/conf/admin_templates/admin_edit_inline_tabular.html

These are templates extracted from the admin code that are now used to render the views. 


M      django/conf/admin_media/js/urlify.js

Change to dashes rather than underscores in slug fields. 

M      django/core/formfields.py

All of the data conversion from POST to something fields can understand now takes place here. 

M      django/core/meta/__init__.py

Added InlineRelatedObject and added manipulator methods for data flattening. 
Also includes a fix to ordering descending select='' fields. 

M      django/core/meta/fields.py

Data flattening pushed down into fields. 

M      django/core/defaulttags.py

Added "include" tag, which is like ssi parsed, but uses normal template resolution rather than absolute paths. 

M      django/core/validators.py

Allow dashes in slugfields. 

A      django/templatetags/admin_modify.py

A new set of template tags to provide functionality for the admin. 

M      django/views/admin/main.py

New view functions for add and change. New helper objects for the admin templates to access ( BoundField, AdminFieldSet)

M      tests/runtests.py

Show the details of an error rather than assuming the existance of a database.


git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-30 12:16:43 +00:00
Jacob Kaplan-Moss
27b1f69d79 Fixed #295 - added {{{forloop.revcounter}}} and {{{forloop.revcounter0}}} variables to for loops. Also updated the docs and added unit tests to verify correct behavior. Thanks, Clint. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-29 23:34:29 +00:00
Adrian Holovaty
8a7189f38f Fixed #501 -- Fixed block.super in multi-level templates, and added unit tests to confirm. Thanks for the patch, django@kieranholland.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-29 04:22:09 +00:00
Adrian Holovaty
fa8662a13f Added unit test to confirm #558 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-26 05:00:29 +00:00
Adrian Holovaty
c05cce5c52 Fixed #556 -- ManyToManyField join tables no longer assume the primary keys of both associated tables are integers. Also added unit tests to confirm. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-25 18:29:59 +00:00
Adrian Holovaty
473306a658 Added unit test to one_to_one model that confirms #527 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-20 01:12:24 +00:00
Adrian Holovaty
09bd9d3ef6 Fixed #506 -- runtests.py now allows models to be tested individually. Thanks, Simon 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-19 01:18:04 +00:00
Adrian Holovaty
095305cb44 Fixed #486 -- Fixed bug in template filter parsing in edge cases, and added unit tests. Thanks, Simon 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-11 15:18:04 +00:00
Adrian Holovaty
95e8688d7f Added unit test that confirms #404 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-02 20:37:24 +00:00
Adrian Holovaty
def5d10ffc Fixed #365 -- Changed template.resolve_variable to resolve hard-coded strings. Thanks, davidschein 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-09-01 02:18:04 +00:00
Adrian Holovaty
d80ac5ac25 Fixed #256 and #334 -- Added {% ifequal %} template tag. Also, {% ifequal %} and {% ifnotequal %} now both accept an optional {% else %} clause. Unit tests included. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-29 21:11:41 +00:00
Adrian Holovaty
75b5372a8f Tiny change to docstring in many_to_one_null model unit test 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-26 05:39:23 +00:00
Adrian Holovaty
286698e8e5 Removed 'this isn't yet supported' message from custom_pk unit test docstring -- it IS supported 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-08-26 05:37:26 +00:00