mirror of
https://github.com/django/django.git
synced 2025-10-10 15:29:11 +00:00
http://code.djangoproject.com/svn/django/trunk ........ r5626 | russellm | 2007-07-07 10:16:23 +0800 (Sat, 07 Jul 2007) | 2 lines Added some uncredited authors that worked on the Oracle branch. ........ r5629 | mtredinnick | 2007-07-08 01:15:54 +0800 (Sun, 08 Jul 2007) | 8 lines Changed HttpRequest.path to be a Unicode object. It has already been URL-decoded by the time we see it anyway, so keeping it as a UTF-8 bytestring was causing unnecessary problems. Also added handling for non-ASCII URL fragments in feed creation (the portion that was outside the control of the Feed class was messed up). ........ r5630 | mtredinnick | 2007-07-08 02:24:27 +0800 (Sun, 08 Jul 2007) | 4 lines Fixed #4772 -- Fixed reverse URL creation to work with non-ASCII arguments. Also included a test for non-ASCII strings in URL patterns, although that already worked correctly. ........ r5631 | mtredinnick | 2007-07-08 02:39:23 +0800 (Sun, 08 Jul 2007) | 3 lines Corrected misleading comment from [5619]. Not sure what I was smoking at the time. ........ r5632 | mtredinnick | 2007-07-08 08:39:32 +0800 (Sun, 08 Jul 2007) | 5 lines Fixed reverse URL lookup using functions when the original URL pattern was a string. This is now just as fragile as it was prior to [5609], but works in a few cases that people were relying on, apparently. ........ r5636 | mtredinnick | 2007-07-08 19:22:53 +0800 (Sun, 08 Jul 2007) | 4 lines Fixed #4798-- Made sure that function keyword arguments are strings (for the keywords themselves) when using Unicode URL patterns. ........ r5638 | gwilson | 2007-07-10 10:34:42 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4817 -- Removed leading forward slashes from some urlconf examples in the documentation. ........ r5639 | gwilson | 2007-07-10 10:45:11 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4814 -- Fixed some whitespace issues in tutorial01, thanks John Shaffer. ........ r5640 | gwilson | 2007-07-10 11:26:26 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4812 -- Fixed an octal escape in regular expression that is used in the `isValidEmail` validator, thanks batchman@free.fr. ........ r5641 | mtredinnick | 2007-07-10 20:02:06 +0800 (Tue, 10 Jul 2007) | 3 lines Fixed #4823 -- Fixed a Python 2.3 incompatibility from [5636] (it was even demonstrated by existing tests, so I really screwed this up). ........ r5642 | mtredinnick | 2007-07-10 20:03:36 +0800 (Tue, 10 Jul 2007) | 3 lines Fixed #4804 -- Fixed a problem when validating choice lists with non-ASCII data. Thanks, django@vonposer.de. ........ r5643 | mtredinnick | 2007-07-10 20:33:55 +0800 (Tue, 10 Jul 2007) | 4 lines Fixed #3760 -- Added the ability to manually set feed- and item-level id elements in Atom feeds. This is fully backwards compatible. Based on a patch from spark343@cs.ubc.ca. ........ r5644 | mtredinnick | 2007-07-11 14:55:12 +0800 (Wed, 11 Jul 2007) | 3 lines Fixed #4815 -- Fixed decoding of request parameters when the input encoding is not UTF-8. Thanks, Jordan Dimov. ........ r5645 | mtredinnick | 2007-07-11 15:00:27 +0800 (Wed, 11 Jul 2007) | 3 lines Fixed #4802 -- Updated French translation. Combined contribution from baptiste.goupil@gmail.com and rocherl@club-internet.fr. ........ r5646 | mtredinnick | 2007-07-11 15:12:50 +0800 (Wed, 11 Jul 2007) | 2 lines Fixed #4753 -- Small update to Spanish translation from Mario Gonzalez. ........ r5649 | jacob | 2007-07-12 08:33:44 +0800 (Thu, 12 Jul 2007) | 1 line Fixed #4615: corrected reverse URL resolution examples in tutorial 4. Thanks for the patch, simeonf. ........ r5650 | adrian | 2007-07-12 12:43:29 +0800 (Thu, 12 Jul 2007) | 1 line Added 'New in Django development version' note to docs/syndication_feeds.txt changes from [5643] ........ r5651 | adrian | 2007-07-12 12:44:45 +0800 (Thu, 12 Jul 2007) | 1 line Edited changes to docs/tutorial04.txt from [5649] ........ r5652 | adrian | 2007-07-12 13:23:47 +0800 (Thu, 12 Jul 2007) | 1 line Added helpful error message to SiteManager.get_current() if the user hasn't set SITE_ID ........ r5653 | adrian | 2007-07-12 13:28:04 +0800 (Thu, 12 Jul 2007) | 1 line Added RequestSite class to sites framework ........ r5654 | adrian | 2007-07-12 13:29:32 +0800 (Thu, 12 Jul 2007) | 1 line Improved syndication feed framework to use RequestSite if the sites framework is not installed -- i.e., the sites framework is no longer required to use the syndication feed framework. This is backwards incompatible if anybody has subclassed Feed and overridden __init__(), because the second parameter is now expected to be an HttpRequest object instead of request.path ........ r5658 | russellm | 2007-07-12 15:45:35 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4459 -- Added 'raw' argument to save method, to override any pre-save processing, and modified serializers to use a raw-save. This enables serialization of DateFields with auto_now/auto_now_add. Also modified serializers to invoke save() directly on the model baseclass, to avoid any (potentially order-dependent, data modifying) behavior in a custom save() method. ........ r5659 | russellm | 2007-07-12 19:24:16 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #3770 -- Remove null=True tag from OneToOne serialization test. OneToOne fields can't have a value of null. ........ r5660 | russellm | 2007-07-12 19:27:38 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #3768 -- Disabled NullBooleanField PK serialization test. We can't and don't test null PK values. ........ r5662 | russellm | 2007-07-12 20:33:24 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4837 -- Updated Debian packaging details. Thanks for the suggestion, Yasushi Masuda <whosaysni@gmail.com>. ........ r5663 | russellm | 2007-07-12 20:44:05 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4808 -- Added Chilean regions in localflavor. Thanks, Marijn Vriens <marijn@metronomo.cl>. ........ r5664 | russellm | 2007-07-12 20:48:27 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4745 -- Updated docs to point out that 0 is not a valid SITE_ID when running the tests. Thanks for the suggestion, Lars Stavholm <stava@telcotec.se>. ........ r5665 | russellm | 2007-07-12 20:50:02 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4763 -- Minor typo in cache documentations. Thanks, dan@coffeecode.net. ........ r5666 | russellm | 2007-07-12 20:55:28 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4627 -- Added details on MacPorts packaging of Django. Thanks, Paul Bissex. ........ r5667 | russellm | 2007-07-12 21:23:11 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4640 -- Fixed import to stringfilter in docs. Proposed solution to move stringfilter into django.template.__init__ introduces a circular import problem. ........ r5668 | russellm | 2007-07-12 21:32:00 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4722 -- Clarified discussion about PYTHONPATH in modpython docs. Thanks for the suggestion, Collin Grady <cgrady@the-magi.us>. ........ r5669 | russellm | 2007-07-12 21:37:59 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4755 -- Modified newforms MultipleChoiceField to use list comprehension, rather than iteration. ........ r5670 | russellm | 2007-07-12 21:41:27 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4764 -- Added reference to Locale middleware in middleware docs. Thanks, dan@coffeecode.net. ........ r5671 | russellm | 2007-07-12 21:55:19 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4768 -- Converted timesince and dateformat to use explicit floor division (pre-emptive avoidance of Python 3000 compatibility problem), and removed a redundant millisecond check. Thanks, John Shaffer <jshaffer2112@gmail.com>. ........ r5672 | russellm | 2007-07-12 22:00:13 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4775 -- Added some missing Hungarian accents to the urlify.js LATIN_MAP. Thanks, Pistahh <szekeres@iii.hu>. ........ r5673 | russellm | 2007-07-12 22:05:16 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4502 -- Clarified reference to view in tutorial. Thanks for the suggestion, Carl Karsten <carl@personnelware.com>. ........ r5674 | russellm | 2007-07-12 22:11:41 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4522 -- Clarified the allowed filter arguments on the time and date filters. Thanks for the suggestion, admackin@gmail.com. ........ r5675 | russellm | 2007-07-12 22:21:51 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4525 -- Fixed mistaken documentation on arguments to runfcgi. Thanks, Johan Bergstrom <bugs@bergstroem.nu>. ........ r5676 | russellm | 2007-07-12 22:41:32 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4538 -- Split the installation instructions to differentiate between installing a distribution package and installing an official release. Thanks to Carl Karsten for the idea, and Paul Bissex for the patch. ........ r5677 | russellm | 2007-07-12 23:26:37 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4526 -- Modified the test Client login method to fail when a user is inactive. Thanks, marcin@elksoft.pl. ........ r5678 | russellm | 2007-07-13 13:03:33 +0800 (Fri, 13 Jul 2007) | 2 lines Fixed #3505 -- Added handling for the error raised when the user forgets the comma in a single element tuple when defining AUTHENTICATION_BACKENDS. Thanks for the help identifying this problem, Mario Gonzalez <gonzalemario@gmail.com>. ........ r5679 | mtredinnick | 2007-07-13 16:52:07 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #2591 -- Fixed a problem with inspectdb with psycopg2 (only). Patch from Gary Wilson. ........ r5680 | mtredinnick | 2007-07-13 17:09:59 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4807 -- Fixed a couple of corner cases in decimal form input validation. Based on a suggestion from Chriss Moffit. ........ r5681 | mtredinnick | 2007-07-13 17:14:51 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4839 -- Added __repr__ methods to URL classes that show the pattern they contain. Thanks, Thomas G?\195?\188ttler. ........ r5682 | mtredinnick | 2007-07-13 18:56:30 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4842 -- Added slightly more robust error reporting. Thanks, Thomas G?\195?\188ttler. ........ r5683 | mtredinnick | 2007-07-13 19:05:01 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4846 -- Fixed some Python 2.3 encoding problems in the admin interface. Based on a patch from daybreaker12@gmail.com. ........ r5684 | mtredinnick | 2007-07-13 20:03:20 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4861 -- Removed some duplicated logic from the newforms RegexField by making it a subclass of CharField. Thanks, Collin Grady. ........ r5685 | mtredinnick | 2007-07-13 21:15:35 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4865 -- Replaced a stray generator comprehension with a list comprehension so that we don't break Python 2.3. ........ r5686 | mtredinnick | 2007-07-13 22:13:35 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4469 -- Added slightly more informative error messages to max- and min-length newform validation. Based on a patch from A. Murat Eren. ........ r5687 | mtredinnick | 2007-07-13 22:14:47 +0800 (Fri, 13 Jul 2007) | 2 lines Added author credit for [5686]. Refs #4469. ........ r5688 | mtredinnick | 2007-07-13 22:33:46 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4484 -- Fixed APPEND_SLASH handling to handle an empty path value. Thanks, VesselinK. ........ r5689 | mtredinnick | 2007-07-13 22:40:39 +0800 (Fri, 13 Jul 2007) | 2 lines Fixed #4556 -- Stylistic changes to [5500]. Thanks, glin@seznam.cz. ........ r5690 | gwilson | 2007-07-14 04:36:01 +0800 (Sat, 14 Jul 2007) | 2 lines Refs #2591 -- Removed int conversion and try/except since the value in the single-item list is already an int. I overlooked this in my original patch, which was applied in [5679]. ........ r5691 | adrian | 2007-07-14 05:20:07 +0800 (Sat, 14 Jul 2007) | 1 line Documented the 'commit' argument to save() methods on forms created via form_for_model() or form_for_instance() ........ r5692 | mtredinnick | 2007-07-14 13:27:22 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4869 -- Added a note that syncdb does not alter existing tables. Thanks, James Bennett. ........ r5693 | mtredinnick | 2007-07-14 20:48:24 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4863 -- Removed comment references to a no-longer present link. Pointed out by Thomas G?\195?\188ttler. ........ r5694 | mtredinnick | 2007-07-14 21:14:28 +0800 (Sat, 14 Jul 2007) | 2 lines Fixed #4862 -- Fixed invalid Javascript creation in popup windows in admin. ........ r5695 | mtredinnick | 2007-07-14 21:39:41 +0800 (Sat, 14 Jul 2007) | 2 lines Fixed a problem with translatable strings from [5686]. ........ r5696 | mtredinnick | 2007-07-14 22:47:14 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4731 -- Changed management.setup_environ() so that it no longer assumes the settings module is called "settings". Patch from SmileyChris. ........ r5697 | mtredinnick | 2007-07-14 22:50:35 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4870 -- Removed unneeded import and fixed a docstring in an example. Thanks, Collin Grady. ........ r5698 | adrian | 2007-07-15 00:58:54 +0800 (Sun, 15 Jul 2007) | 1 line Edited docs/db-api.txt changes from [5658] ........ r5699 | adrian | 2007-07-15 01:04:30 +0800 (Sun, 15 Jul 2007) | 1 line Negligible capitalization fix in test/client.py docstring ........ r5700 | russellm | 2007-07-15 12:41:59 +0800 (Sun, 15 Jul 2007) | 2 lines Clarified the documentation on the steps that happen during a save, and how raw save affects those steps. ........ r5701 | gwilson | 2007-07-15 13:03:28 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #4310 -- Fixed a regular expression bug in `strip_entities` function and added tests for several `django.utils.html` functions. Based on patch from Brian Harring. ........ r5702 | gwilson | 2007-07-15 13:11:06 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #4877 -- Fixed typo in testing documentation, patch from John Shaffer. ........ r5703 | gwilson | 2007-07-15 14:24:54 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #3012 -- Changed the locmem cache backend to use pickle instead of deepcopy to make it compatible with iterators (which cannot be copied). Patch from Sundance. ........ r5704 | gwilson | 2007-07-15 14:29:45 +0800 (Sun, 15 Jul 2007) | 2 lines Changed imports to adhere to PEP 8. ........ r5705 | mtredinnick | 2007-07-15 17:39:13 +0800 (Sun, 15 Jul 2007) | 3 lines Fixed #4880 -- Updated Spanish translation (includes re-encoding to UTF-8). Thanks, Jorge Gajon. ........ r5706 | mtredinnick | 2007-07-15 17:46:42 +0800 (Sun, 15 Jul 2007) | 3 lines Fixed #4882 -- Updated Argentinean Spanish translation (includes re-encoding to UTF-8). Thanks, Ramiro Morales. ........ r5707 | mtredinnick | 2007-07-15 18:08:05 +0800 (Sun, 15 Jul 2007) | 3 lines Re-encoded djangojs.po for French and German locales to UTF-8. These were the last two non-UTF-8 PO files. ........ r5708 | mtredinnick | 2007-07-15 18:10:44 +0800 (Sun, 15 Jul 2007) | 6 lines Fixed #4734 -- Changed message extraction to permit non-ACSII msgid strings. Thanks, krzysiek.pawlik@silvermedia.pl. This is slightly backwards-incompatible for translators: PO files are now assumed to be in UTF-8 encoding. ........ r5709 | adrian | 2007-07-16 03:34:21 +0800 (Mon, 16 Jul 2007) | 1 line Edited docs/db-api.txt changes from [5700] ........ r5710 | adrian | 2007-07-16 05:16:32 +0800 (Mon, 16 Jul 2007) | 1 line Improved docs/templates.txt section on the 'regroup' tag ........ r5711 | mtredinnick | 2007-07-16 11:48:03 +0800 (Mon, 16 Jul 2007) | 2 lines Updated AUTHORS for [5708]. ........ r5712 | mtredinnick | 2007-07-16 11:50:22 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4199 -- Changed date formatting in HTTP expires header to be spec compliant. Thanks, Chris Bennett. ........ r5713 | mtredinnick | 2007-07-16 12:45:45 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4884 -- Fixed an initialisation problem when assigned to settings before accessing them. Thanks, Noam Raphael. ........ r5714 | mtredinnick | 2007-07-16 12:47:52 +0800 (Mon, 16 Jul 2007) | 2 lines Fixed #4806 -- Updated Simplified Chinese translation. Thanks, limodou. ........ r5715 | mtredinnick | 2007-07-16 12:54:49 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4887 -- Fixed another place where template tag arguments are used directly as function keyword args. Thanks, Brian Rosner. ........ r5716 | gwilson | 2007-07-16 13:00:18 +0800 (Mon, 16 Jul 2007) | 2 lines Refs #3012 -- Removed iterator from `test_data_types` cache test that I added in [5703]. Iterators cannot be pickled either. Left the rest of [5703] there though since it fixed another issue that was causing the `test_data_types` cache test to fail with the `locmem` cache backend, the fact that functions cannot be copied. ........ r5717 | gwilson | 2007-07-16 13:28:13 +0800 (Mon, 16 Jul 2007) | 2 lines Cleaned up a couple unused imports and fixed docstrings to follow Python Style Guide. ........ r5718 | mtredinnick | 2007-07-16 17:36:10 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4845 -- Fixed some problems with Unicode usage and caching. Thanks, Jeremy Dunck. ........ r5719 | gwilson | 2007-07-16 21:47:43 +0800 (Mon, 16 Jul 2007) | 2 lines Removed unused variable and changed comments about `permalink` decorator into a docstring. ........ r5720 | gwilson | 2007-07-17 06:29:09 +0800 (Tue, 17 Jul 2007) | 2 lines Fixed #4851 -- Fixed description of an example query in `db-api` docs. ........ r5721 | mtredinnick | 2007-07-17 12:22:11 +0800 (Tue, 17 Jul 2007) | 2 lines Fixed #4898 -- Fixed a precendence problem when constructing HTTP Date header. ........ r5722 | mtredinnick | 2007-07-17 18:25:43 +0800 (Tue, 17 Jul 2007) | 3 lines Fixed #4899 -- Fixed a problem with PO file header generation caused by [5708]. Thanks, Ramiro Morales. ........ r5723 | mtredinnick | 2007-07-19 17:23:45 +0800 (Thu, 19 Jul 2007) | 2 lines Fixed #4917 -- Updated Swedish translation. Thanks, Pilip Lindborg. ........ r5724 | mtredinnick | 2007-07-19 17:24:36 +0800 (Thu, 19 Jul 2007) | 2 lines Fixed #3925 -- Added Slovak localflavor items. Thanks, Martin Kos?\195?\173r. ........ r5725 | adrian | 2007-07-20 14:28:56 +0800 (Fri, 20 Jul 2007) | 1 line Added a db_type() method to the database Field class. This is a hook for calculating the database column type for a given Field. Also converted all management.py CREATE TABLE statements to use db_type(), which made that code cleaner. The Field.get_internal_type() hook still exists, but we should consider removing it at some point, because db_type() is more general. Also added docs -- the beginnings of docs on how to create custom database Field classes. This is backwards-compatible. ........ r5726 | adrian | 2007-07-20 14:34:26 +0800 (Fri, 20 Jul 2007) | 1 line Simplified the indent level in management.py _get_sql_model_create() by using a 'continue' statement rather than nesting everything in an 'if' ........ r5727 | russellm | 2007-07-20 20:07:58 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4558 -- Modified XML serializer to handle whitespace better around None tags. Thanks to Bill Fenner <fenner@gmail.com> for the report and fix. ........ r5728 | russellm | 2007-07-20 20:15:02 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4897 -- Fixed minor typo in doctest comment. ........ r5729 | russellm | 2007-07-20 21:57:49 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #3782 -- Added support for the suite() method recommended by the Python unittest docs. Thanks for the suggestion, rene.puls@repro-mayr.de. ........ r5730 | russellm | 2007-07-20 22:07:54 +0800 (Fri, 20 Jul 2007) | 2 lines Refs #3782 -- Added documentation note that suite() handling is only in development version. ........ r5731 | russellm | 2007-07-20 22:32:20 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4901 -- Modified assertContains to provide a default check of 'any instances of text in content'. Thanks for the suggestion, nis@superlativ.dk. ........ r5732 | russellm | 2007-07-20 22:42:57 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4738 -- Modified the prompt that is displayed when a test database cannot be created. The existing prompt was misleading if the issue wasn't a pre-existing database. Thanks for the suggestion, John Shaffer <jshaffer2112@gmail.com>. ........ r5733 | adrian | 2007-07-20 23:40:54 +0800 (Fri, 20 Jul 2007) | 1 line Fixed negligible typo in docstring in tests/regressiontests/test_client_regress/models.py from [5731] ........ r5736 | adrian | 2007-07-21 05:24:30 +0800 (Sat, 21 Jul 2007) | 1 line Added some additional docs to docs/model-api.txt db_type() section ........ r5738 | russellm | 2007-07-21 11:30:38 +0800 (Sat, 21 Jul 2007) | 2 lines Fixed #4304 -- Modified sys.exit to os._exit to make sure development server quits when an error occurs attempting to bind to the requested port (e.g., if another server is already running). Thanks, Mario Gonzalez <gonzalemario@gmail.com>. ........ r5739 | russellm | 2007-07-21 12:36:28 +0800 (Sat, 21 Jul 2007) | 2 lines Minor fix to allow for count=0 in assertContains. ........ r5740 | russellm | 2007-07-21 13:15:19 +0800 (Sat, 21 Jul 2007) | 2 lines Added test cases for change [5739]. ........ r5741 | russellm | 2007-07-21 13:17:20 +0800 (Sat, 21 Jul 2007) | 2 lines Fixed #4402 -- Modified test client to allow multi-valued inputs on GET requests. Thanks for the suggestion, eddymul@gmail.com. ........ r5743 | gwilson | 2007-07-22 10:18:36 +0800 (Sun, 22 Jul 2007) | 2 lines Fixed #4945 -- Removed unused `GET_ITERATOR_CHUNK_SIZE` definition from manager.py. `GET_ITERATOR_CHUNK_SIZE` is already defined in query.py. Thanks zigiDev@mac.com. ........ r5744 | gwilson | 2007-07-22 11:09:24 +0800 (Sun, 22 Jul 2007) | 2 lines Added docstrings to shortcuts module and functions. ........ r5745 | gwilson | 2007-07-22 11:12:50 +0800 (Sun, 22 Jul 2007) | 2 lines Shortcut functions do not accept `QuerySet` objects, yet :) ........ r5746 | gwilson | 2007-07-22 11:41:11 +0800 (Sun, 22 Jul 2007) | 2 lines Fixed #4373 -- Modified the get_object_or_404/get_list_or_404 shortcuts to also accept `QuerySet`s. Thanks SuperJared. ........ r5747 | gwilson | 2007-07-22 11:45:03 +0800 (Sun, 22 Jul 2007) | 2 lines Corrected typo in [5746]. ........ r5750 | gwilson | 2007-07-23 12:45:01 +0800 (Mon, 23 Jul 2007) | 2 lines Fixed #4952 -- Fixed the `get_template_sources` functions of the `app_directories` and `filesystem` template loaders to not return paths outside of given template directories. Both functions now make use of a new `safe_join` utility function. Thanks to SmileyChris for help with the patch. ........ r5752 | russellm | 2007-07-23 20:14:32 +0800 (Mon, 23 Jul 2007) | 2 lines Fixed #3771 -- Modified the test runner to observe the --noinput argument controlling script interactivity. This means that test scripts can now be put in a buildbot environment. This is a backwards incompatible change for anyone that has written a custom test runner. Thanks for the suggestion, moof@metamoof.net. ........ r5753 | russellm | 2007-07-23 21:52:59 +0800 (Mon, 23 Jul 2007) | 2 lines Added documentation for a test runner argument that has always been present, but was undocumented. ........ r5756 | adrian | 2007-07-25 11:12:31 +0800 (Wed, 25 Jul 2007) | 1 line Changed docstring additions from [5744] to use active verbs ('returns' instead of 'return') ........ r5757 | adrian | 2007-07-25 11:15:05 +0800 (Wed, 25 Jul 2007) | 1 line Added 'New in Django development version' to docs/db-api.txt change from [5746] ........ r5758 | adrian | 2007-07-25 11:18:17 +0800 (Wed, 25 Jul 2007) | 1 line Changed safe_join() docstring from [5750] to use active verbs. See also [5756] ........ r5764 | gwilson | 2007-07-26 13:01:53 +0800 (Thu, 26 Jul 2007) | 2 lines Fixed #4971 -- Fixed some escaping and quoting problems in the databrowse contrib app. Based on patch from Johann Queuniet. ........ r5765 | adrian | 2007-07-27 01:16:34 +0800 (Fri, 27 Jul 2007) | 1 line Added section to docs/contributing.txt about docstring coding style ........ r5766 | mtredinnick | 2007-07-27 06:59:34 +0800 (Fri, 27 Jul 2007) | 2 lines Added support for database cache table in test database. ........ r5767 | adrian | 2007-07-28 05:53:02 +0800 (Sat, 28 Jul 2007) | 1 line Added unit test that confirms a bug in ValuesQuerySets that have extra(select) specified. If the select dictionary has several fields, Django assigns the wrong values to the select-field names ........ r5768 | adrian | 2007-07-28 06:07:42 +0800 (Sat, 28 Jul 2007) | 1 line Fixed bug with using values() and extra(select) in the same QuerySet, with a select dictionary containing more than a few elements. This bug was identified in unit test from [5767]. The problem was that we were relying on the dictionary's .items() ordering, which is undefined ........ r5769 | russellm | 2007-07-28 12:02:52 +0800 (Sat, 28 Jul 2007) | 2 lines Fixed #4460 -- Added the ability to be more specific in the test cases that are executed. This is a backwards incompatible change for any user with a custom test runner. See the wiki for details. ........ r5770 | russellm | 2007-07-28 15:27:53 +0800 (Sat, 28 Jul 2007) | 2 lines Fixed #4995 -- Fixed some problems in documentation ReST formatting. Thanks, Simon G. ........ r5771 | simon | 2007-07-29 02:30:40 +0800 (Sun, 29 Jul 2007) | 1 line After discussing with Malcolm, added set_unusable_password() and has_usable_password() methods to the User object, plus tests and updated documentation ........ r5774 | adrian | 2007-07-30 02:21:16 +0800 (Mon, 30 Jul 2007) | 1 line Added 'New in Django development version' to changes in docs/authentication.txt from [5771] ........ r5778 | gwilson | 2007-07-31 01:25:35 +0800 (Tue, 31 Jul 2007) | 4 lines Fixed call to `ugettext`, which is imported as `_`. Changed raise to conform to PEP 3109 and wrapped the long line. Added beginnings of tests for model fields. ........ r5782 | gwilson | 2007-08-01 13:41:32 +0800 (Wed, 01 Aug 2007) | 2 lines Fixed #4228 -- Removed hardcoding of `RadioFieldRenderer` in the `RadioSelect` Widget so that the display of `RadioSelect`s can be more easily customized. `BoundField.__unicode__` also no longer special cases `RadioSelect` since `RadioSelect.render()` now returns a string like every other Widget. ........ r5783 | gwilson | 2007-08-01 13:52:18 +0800 (Wed, 01 Aug 2007) | 2 lines Fixed #5037 -- Fixed use of wrong field type in a db-api docs example, thanks ubernostrum. ........ r5796 | gwilson | 2007-08-04 11:19:14 +0800 (Sat, 04 Aug 2007) | 2 lines Fixed #5078 -- Fixed several broken links to the syndication documentation. ........ r5797 | gwilson | 2007-08-04 11:36:58 +0800 (Sat, 04 Aug 2007) | 2 lines Changed the 0.95 release notes to point to the 0.95 documentation index. ........ r5798 | gwilson | 2007-08-04 11:39:24 +0800 (Sat, 04 Aug 2007) | 2 lines Changed several documentation links to be relative. ........ r5799 | gwilson | 2007-08-04 22:41:49 +0800 (Sat, 04 Aug 2007) | 2 lines Refs #3397 -- Corrected the Exception that is caught when ordering by non-fields (added in [4596]), thanks glin@seznam.cz. ........ r5800 | gwilson | 2007-08-04 22:52:13 +0800 (Sat, 04 Aug 2007) | 2 lines Fixed #5083 -- Fixed typo in newforms documentation, thanks Rik. ........ r5801 | gwilson | 2007-08-05 12:39:52 +0800 (Sun, 05 Aug 2007) | 2 lines Refs #5089 -- Added file name to poll detail template examples in the tutorial. ........ r5802 | gwilson | 2007-08-05 12:42:26 +0800 (Sun, 05 Aug 2007) | 2 lines Changed some more links to be relative in the documentation. I had a couple unsaved files that didn't get in with [5798]. ........ r5803 | gwilson | 2007-08-05 13:14:46 +0800 (Sun, 05 Aug 2007) | 2 lines 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. ........ r5804 | russellm | 2007-08-05 15:39:36 +0800 (Sun, 05 Aug 2007) | 2 lines Fixed #4001 -- Added dynamic save_m2m method() to forms created with form_for_model and form_for_instance on save(commit=False). ........ r5807 | adrian | 2007-08-06 12:36:43 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5074 -- Added link to audio clip of 'Django' pronunciation ........ r5808 | adrian | 2007-08-06 12:52:14 +0800 (Mon, 06 Aug 2007) | 1 line Edited docs/newforms.txt changes from [5804] ........ r5809 | adrian | 2007-08-06 13:04:27 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5082 -- Enabled tab completion in 'django-admin.py shell' for objects that were imported into the global namespace at runtime. Thanks, dusk@woofle.net ........ r5810 | adrian | 2007-08-06 13:06:15 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5077 -- django/utils/encoding.py no longer imports settings, as it doesn't use that module. Thanks, Collin Grady ........ r5811 | adrian | 2007-08-06 13:07:38 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5071 -- Fixed 'global name ugettext is not defined' error in django.core.validators. Thanks, Marco Bonetti ........ r5812 | adrian | 2007-08-06 13:13:06 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5064 -- Fixed potentially confusing sentence in docs/authentication.txt. Thanks, Collin Grady ........ r5813 | adrian | 2007-08-06 13:16:35 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5053 -- Added 'action' attribute to <form> tags that didn't have that attribute in docs/newforms.txt examples. Perfectionism appreciated, trickyb ........ r5814 | adrian | 2007-08-06 13:27:58 +0800 (Mon, 06 Aug 2007) | 1 line Added a closing </p>' to a code example in docs/email.txt ........ r5815 | adrian | 2007-08-06 13:28:45 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5006 -- Fixed incorrect/outdated docstring for the 'if' template tag. Thanks, Thomas Petazzoni ........ r5816 | adrian | 2007-08-06 13:33:18 +0800 (Mon, 06 Aug 2007) | 1 line Added note to docs/model-api.txt about help_text not being escaped in the admin interface ........ r5817 | adrian | 2007-08-06 13:34:45 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #4985 -- Clarified location of HttpResponse in docs/request_response.txt. Thanks for raising the issue, rainer.mansfeld@romulo.de ........ r5818 | adrian | 2007-08-06 13:37:17 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #4980 -- Removed 'forms' from the 'not considered stable and will be rewritten' section of docs/api_stability.txt. They've already been rewritten. ........ r5819 | russellm | 2007-08-06 21:58:56 +0800 (Mon, 06 Aug 2007) | 2 lines Fixed #3297 -- Implemented FileField and ImageField for newforms. Thanks to the many users that contributed to and tested this patch. ........ r5820 | russellm | 2007-08-06 22:17:10 +0800 (Mon, 06 Aug 2007) | 2 lines Added note that FileField and ImageField are only in development version. There are also some minor backwards compatibility issues with the changes introduced in [5819] - see the wiki for details. ........ r5823 | adrian | 2007-08-07 04:27:04 +0800 (Tue, 07 Aug 2007) | 1 line Fixed British spelling of 'customize' and 'behavior' in Manager.get_query_set() docstring ........ r5824 | adrian | 2007-08-07 10:18:36 +0800 (Tue, 07 Aug 2007) | 1 line Fixed #5105 -- Fixed two ReST errors in docs/newforms.txt. Thanks, Ramiro Morales ........ r5825 | adrian | 2007-08-07 10:33:11 +0800 (Tue, 07 Aug 2007) | 1 line Fixed #5097 -- Made various updates and corrections to the documentation. Thanks, Nicola Larosa ........ r5826 | russellm | 2007-08-07 19:20:15 +0800 (Tue, 07 Aug 2007) | 2 lines Removed a redundant directory join during FileField form saving. Thanks to David Danier's eagle eyes for picking up this one. ........ git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
438 lines
18 KiB
Plaintext
438 lines
18 KiB
Plaintext
=====================================
|
|
Writing your first Django app, part 2
|
|
=====================================
|
|
|
|
This tutorial begins where `Tutorial 1`_ left off. We're continuing the Web-poll
|
|
application and will focus on Django's automatically-generated admin site.
|
|
|
|
.. _Tutorial 1: ../tutorial01/
|
|
|
|
.. admonition:: Philosophy
|
|
|
|
Generating admin sites for your staff or clients to add, change and delete
|
|
content is tedious work that doesn't require much creativity. For that reason,
|
|
Django entirely automates creation of admin interfaces for models.
|
|
|
|
Django was written in a newsroom environment, with a very clear separation
|
|
between "content publishers" and the "public" site. Site managers use the
|
|
system to add news stories, events, sports scores, etc., and that content is
|
|
displayed on the public site. Django solves the problem of creating a unified
|
|
interface for site administrators to edit content.
|
|
|
|
The admin isn't necessarily intended to be used by site visitors; it's for site
|
|
managers.
|
|
|
|
Activate the admin site
|
|
=======================
|
|
|
|
The Django admin site is not activated by default -- it's an opt-in thing. To
|
|
activate the admin site for your installation, do these three things:
|
|
|
|
* Add ``"django.contrib.admin"`` to your ``INSTALLED_APPS`` setting.
|
|
* Run ``python manage.py syncdb``. Since you have added a new application
|
|
to ``INSTALLED_APPS``, the database tables need to be updated.
|
|
* Edit your ``mysite/urls.py`` file and uncomment the line below
|
|
"Uncomment this for admin:". This file is a URLconf; we'll dig into
|
|
URLconfs in the next tutorial. For now, all you need to know is that it
|
|
maps URL roots to applications.
|
|
|
|
Start the development server
|
|
============================
|
|
|
|
Let's start the development server and explore the admin site.
|
|
|
|
Recall from Tutorial 1 that you start the development server like so::
|
|
|
|
python manage.py runserver
|
|
|
|
Now, open a Web browser and go to "/admin/" on your local domain -- e.g.,
|
|
http://127.0.0.1:8000/admin/. You should see the admin's login screen:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin01.png
|
|
:alt: Django admin login screen
|
|
|
|
Enter the admin site
|
|
====================
|
|
|
|
Now, try logging in. (You created a superuser account in the first part of this
|
|
tutorial, remember?) You should see the Django admin index page:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin02t.png
|
|
:alt: Django admin index page
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin02.png
|
|
|
|
You should see a few other types of editable content, including groups, users
|
|
and sites. These are core features Django ships with by default.
|
|
|
|
.. _"I can't log in" questions: ../faq/#the-admin-site
|
|
|
|
Make the poll app modifiable in the admin
|
|
=========================================
|
|
|
|
But where's our poll app? It's not displayed on the admin index page.
|
|
|
|
Just one thing to do: We need to specify in the ``Poll`` model that ``Poll``
|
|
objects have an admin interface. Edit the ``mysite/polls/models.py`` file and
|
|
make the following change to add an inner ``Admin`` class::
|
|
|
|
class Poll(models.Model):
|
|
# ...
|
|
class Admin:
|
|
pass
|
|
|
|
The ``class Admin`` will contain all the settings that control how this model
|
|
appears in the Django admin. All the settings are optional, however, so
|
|
creating an empty class means "give this object an admin interface using
|
|
all the default options."
|
|
|
|
Now reload the Django admin page to see your changes. Note that you don't have
|
|
to restart the development server -- the server will auto-reload your project,
|
|
so any modifications code will be seen immediately in your browser.
|
|
|
|
Explore the free admin functionality
|
|
====================================
|
|
|
|
Now that ``Poll`` has the inner ``Admin`` class, Django knows that it should be
|
|
displayed on the admin index page:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin03t.png
|
|
:alt: Django admin index page, now with polls displayed
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin03.png
|
|
|
|
Click "Polls." Now you're at the "change list" page for polls. This page
|
|
displays all the polls in the database and lets you choose one to change it.
|
|
There's the "What's up?" poll we created in the first tutorial:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin04t.png
|
|
:alt: Polls change list page
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin04.png
|
|
|
|
Click the "What's up?" poll to edit it:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin05t.png
|
|
:alt: Editing form for poll object
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin05.png
|
|
|
|
Things to note here:
|
|
|
|
* The form is automatically generated from the Poll model.
|
|
* The different model field types (``models.DateTimeField``, ``models.CharField``)
|
|
correspond to the appropriate HTML input widget. Each type of field knows
|
|
how to display itself in the Django admin.
|
|
* Each ``DateTimeField`` gets free JavaScript shortcuts. Dates get a "Today"
|
|
shortcut and calendar popup, and times get a "Now" shortcut and a convenient
|
|
popup that lists commonly entered times.
|
|
|
|
The bottom part of the page gives you a couple of options:
|
|
|
|
* Save -- Saves changes and returns to the change-list page for this type of
|
|
object.
|
|
* Save and continue editing -- Saves changes and reloads the admin page for
|
|
this object.
|
|
* Save and add another -- Saves changes and loads a new, blank form for this
|
|
type of object.
|
|
* Delete -- Displays a delete confirmation page.
|
|
|
|
Change the "Date published" by clicking the "Today" and "Now" shortcuts. Then
|
|
click "Save and continue editing." Then click "History" in the upper right.
|
|
You'll see a page listing all changes made to this object via the Django admin,
|
|
with the timestamp and username of the person who made the change:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin06t.png
|
|
:alt: History page for poll object
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin06.png
|
|
|
|
Customize the admin form
|
|
========================
|
|
|
|
Take a few minutes to marvel at all the code you didn't have to write.
|
|
|
|
Let's customize this a bit. We can reorder the fields by explicitly adding a
|
|
``fields`` parameter to ``Admin``::
|
|
|
|
class Admin:
|
|
fields = (
|
|
(None, {'fields': ('pub_date', 'question')}),
|
|
)
|
|
|
|
That made the "Publication date" show up first instead of second:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin07.png
|
|
:alt: Fields have been reordered
|
|
|
|
This isn't impressive with only two fields, but for admin forms with dozens
|
|
of fields, choosing an intuitive order is an important usability detail.
|
|
|
|
And speaking of forms with dozens of fields, you might want to split the form
|
|
up into fieldsets::
|
|
|
|
class Admin:
|
|
fields = (
|
|
(None, {'fields': ('question',)}),
|
|
('Date information', {'fields': ('pub_date',)}),
|
|
)
|
|
|
|
The first element of each tuple in ``fields`` is the title of the fieldset.
|
|
Here's what our form looks like now:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin08t.png
|
|
:alt: Form has fieldsets now
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin08.png
|
|
|
|
You can assign arbitrary HTML classes to each fieldset. Django provides a
|
|
``"collapse"`` class that displays a particular fieldset initially collapsed.
|
|
This is useful when you have a long form that contains a number of fields that
|
|
aren't commonly used::
|
|
|
|
class Admin:
|
|
fields = (
|
|
(None, {'fields': ('question',)}),
|
|
('Date information', {'fields': ('pub_date',), 'classes': 'collapse'}),
|
|
)
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin09.png
|
|
:alt: Fieldset is initially collapsed
|
|
|
|
Adding related objects
|
|
======================
|
|
|
|
OK, we have our Poll admin page. But a ``Poll`` has multiple ``Choices``, and
|
|
the admin page doesn't display choices.
|
|
|
|
Yet.
|
|
|
|
There are two ways to solve this problem. The first is to give the ``Choice``
|
|
model its own inner ``Admin`` class, just as we did with ``Poll``. Here's what
|
|
that would look like::
|
|
|
|
class Choice(models.Model):
|
|
# ...
|
|
class Admin:
|
|
pass
|
|
|
|
Now "Choices" is an available option in the Django admin. The "Add choice" form
|
|
looks like this:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin10.png
|
|
:alt: Choice admin page
|
|
|
|
In that form, the "Poll" field is a select box containing every poll in the
|
|
database. Django knows that a ``ForeignKey`` should be represented in the admin
|
|
as a ``<select>`` box. In our case, only one poll exists at this point.
|
|
|
|
Also note the "Add Another" link next to "Poll." Every object with a ForeignKey
|
|
relationship to another gets this for free. When you click "Add Another," you'll
|
|
get a popup window with the "Add poll" form. If you add a poll in that window
|
|
and click "Save," Django will save the poll to the database and dynamically add
|
|
it as the selected choice on the "Add choice" form you're looking at.
|
|
|
|
But, really, this is an inefficient way of adding Choice objects to the system.
|
|
It'd be better if you could add a bunch of Choices directly when you create the
|
|
Poll object. Let's make that happen.
|
|
|
|
Remove the ``Admin`` for the Choice model. Then, edit the ``ForeignKey(Poll)``
|
|
field like so::
|
|
|
|
poll = models.ForeignKey(Poll, edit_inline=models.STACKED, num_in_admin=3)
|
|
|
|
This tells Django: "Choice objects are edited on the Poll admin page. By
|
|
default, provide enough fields for 3 Choices."
|
|
|
|
Then change the other fields in ``Choice`` to give them ``core=True``::
|
|
|
|
choice = models.CharField(max_length=200, core=True)
|
|
votes = models.IntegerField(core=True)
|
|
|
|
This tells Django: "When you edit a Choice on the Poll admin page, the 'choice'
|
|
and 'votes' fields are required. The presence of at least one of them signifies
|
|
the addition of a new Choice object, and clearing both of them signifies the
|
|
deletion of that existing Choice object."
|
|
|
|
Load the "Add poll" page to see how that looks:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin11t.png
|
|
:alt: Add poll page now has choices on it
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin11.png
|
|
|
|
It works like this: There are three slots for related Choices -- as specified
|
|
by ``num_in_admin`` -- but each time you come back to the "Change" page for an
|
|
already-created object, you get one extra slot. (This means there's no
|
|
hard-coded limit on how many related objects can be added.) If you wanted space
|
|
for three extra Choices each time you changed the poll, you'd use
|
|
``num_extra_on_change=3``.
|
|
|
|
One small problem, though. It takes a lot of screen space to display all the
|
|
fields for entering related Choice objects. For that reason, Django offers an
|
|
alternate way of displaying inline related objects::
|
|
|
|
poll = models.ForeignKey(Poll, edit_inline=models.TABULAR, num_in_admin=3)
|
|
|
|
With that ``edit_inline=models.TABULAR`` (instead of ``models.STACKED``), the
|
|
related objects are displayed in a more compact, table-based format:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin12.png
|
|
:alt: Add poll page now has more compact choices
|
|
|
|
Customize the admin change list
|
|
===============================
|
|
|
|
Now that the Poll admin page is looking good, let's make some tweaks to the
|
|
"change list" page -- the one that displays all the polls in the system.
|
|
|
|
Here's what it looks like at this point:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin04t.png
|
|
:alt: Polls change list page
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin04.png
|
|
|
|
By default, Django displays the ``str()`` of each object. But sometimes it'd
|
|
be more helpful if we could display individual fields. To do that, use the
|
|
``list_display`` option, which is a tuple of field names to display, as columns,
|
|
on the change list page for the object::
|
|
|
|
class Poll(models.Model):
|
|
# ...
|
|
class Admin:
|
|
# ...
|
|
list_display = ('question', 'pub_date')
|
|
|
|
Just for good measure, let's also include the ``was_published_today`` custom
|
|
method from Tutorial 1::
|
|
|
|
list_display = ('question', 'pub_date', 'was_published_today')
|
|
|
|
Now the poll change list page looks like this:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin13t.png
|
|
:alt: Polls change list page, updated
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin13.png
|
|
|
|
You can click on the column headers to sort by those values -- except in the
|
|
case of the ``was_published_today`` header, because sorting by the output of
|
|
an arbitrary method is not supported. Also note that the column header for
|
|
``was_published_today`` is, by default, the name of the method (with
|
|
underscores replaced with spaces). But you can change that by giving that
|
|
method a ``short_description`` attribute::
|
|
|
|
def was_published_today(self):
|
|
return self.pub_date.date() == datetime.date.today()
|
|
was_published_today.short_description = 'Published today?'
|
|
|
|
|
|
Let's add another improvement to the Poll change list page: Filters. Add the
|
|
following line to ``Poll.Admin``::
|
|
|
|
list_filter = ['pub_date']
|
|
|
|
That adds a "Filter" sidebar that lets people filter the change list by the
|
|
``pub_date`` field:
|
|
|
|
.. image:: http://media.djangoproject.com/img/doc/tutorial/admin14t.png
|
|
:alt: Polls change list page, updated
|
|
:target: http://media.djangoproject.com/img/doc/tutorial/admin14.png
|
|
|
|
The type of filter displayed depends on the type of field you're filtering on.
|
|
Because ``pub_date`` is a DateTimeField, Django knows to give the default
|
|
filter options for DateTimeFields: "Any date," "Today," "Past 7 days,"
|
|
"This month," "This year."
|
|
|
|
This is shaping up well. Let's add some search capability::
|
|
|
|
search_fields = ['question']
|
|
|
|
That adds a search box at the top of the change list. When somebody enters
|
|
search terms, Django will search the ``question`` field. You can use as many
|
|
fields as you'd like -- although because it uses a ``LIKE`` query behind the
|
|
scenes, keep it reasonable, to keep your database happy.
|
|
|
|
Finally, because Poll objects have dates, it'd be convenient to be able to
|
|
drill down by date. Add this line::
|
|
|
|
date_hierarchy = 'pub_date'
|
|
|
|
That adds hierarchical navigation, by date, to the top of the change list page.
|
|
At top level, it displays all available years. Then it drills down to months
|
|
and, ultimately, days.
|
|
|
|
Now's also a good time to note that change lists give you free pagination. The
|
|
default is to display 50 items per page. Change-list pagination, search boxes,
|
|
filters, date-hierarchies and column-header-ordering all work together like you
|
|
think they should.
|
|
|
|
Customize the admin look and feel
|
|
=================================
|
|
|
|
Clearly, having "Django administration" at the top of each admin page is
|
|
ridiculous. It's just placeholder text.
|
|
|
|
That's easy to change, though, using Django's template system. The Django admin
|
|
is powered by Django itself, and its interfaces use Django's own template
|
|
system. (How meta!)
|
|
|
|
Open your settings file (``mysite/settings.py``, remember) and look at the
|
|
``TEMPLATE_DIRS`` setting. ``TEMPLATE_DIRS`` is a tuple of filesystem
|
|
directories to check when loading Django templates. It's a search path.
|
|
|
|
By default, ``TEMPLATE_DIRS`` is empty. So, let's add a line to it, to tell
|
|
Django where our templates live::
|
|
|
|
TEMPLATE_DIRS = (
|
|
"/home/my_username/mytemplates", # Change this to your own directory.
|
|
)
|
|
|
|
Now copy the template ``admin/base_site.html`` from within the default Django
|
|
admin template directory (``django/contrib/admin/templates``) into an ``admin``
|
|
subdirectory of whichever directory you're using in ``TEMPLATE_DIRS``. For
|
|
example, if your ``TEMPLATE_DIRS`` includes ``"/home/my_username/mytemplates"``,
|
|
as above, then copy ``django/contrib/admin/templates/admin/base_site.html`` to
|
|
``/home/my_username/mytemplates/admin/base_site.html``. Don't forget that
|
|
``admin`` subdirectory.
|
|
|
|
Then, just edit the file and replace the generic Django text with your own
|
|
site's name as you see fit.
|
|
|
|
Note that any of Django's default admin templates can be overridden. To
|
|
override a template, just do the same thing you did with ``base_site.html`` --
|
|
copy it from the default directory into your custom directory, and make
|
|
changes.
|
|
|
|
Astute readers will ask: But if ``TEMPLATE_DIRS`` was empty by default, how was
|
|
Django finding the default admin templates? The answer is that, by default,
|
|
Django automatically looks for a ``templates/`` subdirectory within each app
|
|
package, for use as a fallback. See the `loader types documentation`_ for full
|
|
information.
|
|
|
|
.. _loader types documentation: ../templates_python/#loader-types
|
|
|
|
Customize the admin index page
|
|
==============================
|
|
|
|
On a similar note, you might want to customize the look and feel of the Django
|
|
admin index page.
|
|
|
|
By default, it displays all available apps, according to your ``INSTALLED_APPS``
|
|
setting. But the order in which it displays things is random, and you may want
|
|
to make significant changes to the layout. After all, the index is probably the
|
|
most important page of the admin, and it should be easy to use.
|
|
|
|
The template to customize is ``admin/index.html``. (Do the same as with
|
|
``admin/base_site.html`` in the previous section -- copy it from the default
|
|
directory to your custom template directory.) Edit the file, and you'll see it
|
|
uses a template tag called ``{% get_admin_app_list as app_list %}``. That's the
|
|
magic that retrieves every installed Django app. Instead of using that, you can
|
|
hard-code links to object-specific admin pages in whatever way you think is
|
|
best.
|
|
|
|
Django offers another shortcut in this department. Run the command
|
|
``python manage.py adminindex polls`` to get a chunk of template code for
|
|
inclusion in the admin index template. It's a useful starting point.
|
|
|
|
For full details on customizing the look and feel of the Django admin site in
|
|
general, see the `Django admin CSS guide`_.
|
|
|
|
When you're comfortable with the admin site, read `part 3 of this tutorial`_ to
|
|
start working on public poll views.
|
|
|
|
.. _Django admin CSS guide: ../admin_css/
|
|
.. _part 3 of this tutorial: ../tutorial03/
|