Commit Graph

223 Commits

Author SHA1 Message Date
Adrian Holovaty 4805675f9d Fixed #2500 -- Fixed bug in admin related-object pop-up window when using a primary key value that isn't an integer. Thanks, Gary Wilson and deryck@samba.org
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-11 05:31:08 +00:00
Adrian Holovaty 3e22c8ff52 Fixed #2506 -- Added more i18n translation strings for admin docs. Thanks, dummy@habmalnefrage.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-11 05:07:07 +00:00
Adrian Holovaty fd5d923c6b Fixed #61 -- No more editing hashes when creating users via the admin. Created a special-case 'Add user' admin view. The change form still displays the hash, for the moment.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-04 04:18:12 +00:00
Jacob Kaplan-Moss 17d0bd1512 Fixed a bunch of spurious imports, typos, and other small errors turned up by a pass through PyFlakes. This covers about the first third of the errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-21 17:11:13 +00:00
Jacob Kaplan-Moss e9a236d86c Fixed #2092: added a "is_secure()" method to HttpRequest which correctly handles the subtleties of mod_python's interaction with os.environ. This one's been bugging me for about a *year*, so many many thanks to k.shaposhnikov@gmail.com for figuring it out, and Tim Shaffer for pointing out this ticket.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-21 16:20:22 +00:00
Adrian Holovaty c4679bb83f Fixed #2374 -- Fixed magic-removal API changes in admin template validator. Thanks, mattimustang@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-20 20:16:03 +00:00
Malcolm Tredinnick 51705f60b1 Fixed #2332 -- Introduced is_authenticated() method on User and AnonymousUser classes. Recommended its use over is_anonymous in the docs. Changed internal Django use to match this recommendation. Thanks to SmileyChris and Gary Wilson for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-19 02:09:26 +00:00
Adrian Holovaty 84dda1990f Fixed #2267 -- Admin docs now show help text for fields. Thanks, vidar
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 04:00:44 +00:00
Jacob Kaplan-Moss aab3a418ac Merged multi-auth branch to trunk. See the authentication docs for the ramifications of this change. Many, many thanks to Joseph Kocherhans for the hard work!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 16:37:02 +00:00
Adrian Holovaty 6dc719312d Fixed #2157 -- Admin doc views now work if django.contrib.sites isn't installed
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-26 23:01:46 +00:00
Jacob Kaplan-Moss bc2d8cdbc6 Fixed #2199: deleting objects with generic foreign keys in the admin now works. Thanks, Jay Parlar
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-22 18:44:06 +00:00
Adrian Holovaty d599052a15 Added AllValuesFilterSpec to admin changelist filters, which lets you put any arbitrary field in Admin.list_filter. To determine the list of all available choices, Django does a SELECT DISTINCT. Note this is backwards-incompatible for people who have defined and registered their own FilterSpecs, because each FilterSpec now takes a 'model' parameter.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-16 19:42:06 +00:00
Luke Plant 9b86db9bf2 Eliminated lots of mutable default arguments (since they are bugs
waiting to happen and are memory leaks too).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-03 13:37:34 +00:00
Adrian Holovaty 5099424975 Negligible spacing change to admin/views/main.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-01 03:35:23 +00:00
Adrian Holovaty 2543d0ae93 Fixed bug in admin where it would redirect infinitely if invalid lookup parameters were given in the URL. Refs #2024
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-31 15:25:23 +00:00
Adrian Holovaty 192c726ee6 Fixed #2050 -- Fixed raw_id_admin display in admin. Thanks, Christopher Lenz
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-31 14:37:57 +00:00
Adrian Holovaty b63157c616 Fixed #1403 -- 'Add' green plus sign no longer appears in admin change forms for fields whose related models don't have an admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-26 17:54:19 +00:00
Adrian Holovaty d31f190239 Fixed #1959 -- Fixed typo in django/contrib/admin/views/doc.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-22 04:47:14 +00:00
Adrian Holovaty dd55b5e98a Fixed #1835 -- FilePathField no longer breaks admin model documentation. Thanks, Adam Endicott
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-22 02:17:06 +00:00
Jacob Kaplan-Moss 20416b2972 Made a few small tweaks to admin doc pages.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-18 15:17:42 +00:00
Luke Plant f57e34e990 Fixed #1579 - added support for 'Q' objects in limit_choices_to.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-06 00:26:24 +00:00
Adrian Holovaty 2b551dec40 Fixed bug in admin: raw_id_admin fields weren't displaying their old values next to the form field, due to descriptor-fields change
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-04 04:09:23 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-02 01:31:56 +00:00
Adrian Holovaty b9e40b14bc Renamed OneToOne to OneToOneRel to be consistent with ManyToManyRel
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-04-10 03:35:56 +00:00
Adrian Holovaty b8d8aca5fd Renamed ManyToOne to ManyToOneRel to be consistent with ManyToManyRel
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-04-10 03:34:47 +00:00
Adrian Holovaty e3e271ff92 Fixed #1600 -- Renamed ManyToMany to ManyToManyRel so people get a clearer error if they use ManyToMany instead of ManyToManyField
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-04-10 03:32:38 +00:00
Adrian Holovaty 92c04cb7c6 Negligible formatting change to [2417] -- changed colon use to be consistent
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-27 21:37:11 +00:00
Jacob Kaplan-Moss b830fa7e78 Exposed model __doc__ in admin docs views which fixes #1408. Thanks, poelzi
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-27 21:05:50 +00:00
Jacob Kaplan-Moss eeb848bdbd Fixed #889 (Thanks, Tom Tobin)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-27 19:13:41 +00:00
Adrian Holovaty c14e692952 Fixed #1250 -- Fixed NameError when trying to delete without related object permissions in admin interface. Thanks, oggie rob
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-17 18:20:15 +00:00
Adrian Holovaty 97eb38b21d Fixed #1296 -- Made SlugField maxlength configurable. Thanks, Matt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-17 18:15:07 +00:00
Adrian Holovaty d5a5f0f790 Fixed #1234 -- Fixed admin problem with login status getting out of sync with multiple windows/tabs. Thanks, oggie rob
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-16 18:54:41 +00:00
Adrian Holovaty c4ab08a7a5 Added missing 'staff_member_required' decorator to change_stage() admin view
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-16 18:49:24 +00:00
Adrian Holovaty 09da166609 Fixed #615 -- Admin views now use escape() instead of strip_tags(). Thanks, Sune Kirkeby
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-15 06:28:41 +00:00
Adrian Holovaty ceb558c277 Fixed #1196 -- Admin deletion step no longer assumes related objects have primary key named 'id'. Thanks, oggie rob
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-15 06:01:35 +00:00
Georg Bauer 3e771e6f9a added missing translation hooks to the login form. thx mikael.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-26 11:52:42 +00:00
Adrian Holovaty d971b31695 Fixed #1092 -- Fixed behavior for query-string overrides in admin forms
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-21 03:37:31 +00:00
Adrian Holovaty 800cac7e31 Negligible refactoring in django.core.meta.fields and django.contrib.admin.views.main. Taken from #1020. Refs #1020
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-10 05:32:05 +00:00
Adrian Holovaty dc2daff31f Fixed inconsistent spacing in contrib.admin.views.main
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-09 02:16:17 +00:00
Adrian Holovaty 9832abf6b4 Fixed #1022 -- Fixed bug in admin when deleting models with OneToOne. Thanks, Eric Moritz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-07 23:36:31 +00:00
Adrian Holovaty 54618dc0fe Improved django.contrib.admin.views.main to raise ImproperlyConfigured if admin app isn't in INSTALLED_APPS. This avoids one possibility of an obscure error.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-06 04:55:33 +00:00
Adrian Holovaty b5288e732c Fixed #951 -- Admin bookmarklets no longer assume admin is rooted at '/'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-01 07:03:23 +00:00
Adrian Holovaty 9541d7a7c7 Fixed #251 -- Added OR support to queries, via the new 'complex' DB API keyword argument. Updated docs and added unit tests. Also removed old, undocumented '_or' parameter. Thanks, Hugo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-30 06:14:05 +00:00
Adrian Holovaty 837435a08a Small simplification to request.GET.items() call in contrib.admin.views.main. Thanks, Kieran
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-30 05:34:51 +00:00
Adrian Holovaty 1f611288c6 Fixed bug in [1504] admin/views/main.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-30 04:15:36 +00:00
Adrian Holovaty 991bb61242 Fixed #736 -- Changed behavior of QueryDict items() to be more consistent, fixed mutability holes, gave MultiValueDict many more dictionary methods and added unit tests. Thanks, Kieran Holland. This is slightly backwards-incompatible if you happened to rely on the behavior of QueryDict.items(), which is highly unlikely.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-30 04:08:46 +00:00
Adrian Holovaty 2af63d3aab Fixed #954 -- Many-to-many raw_id_admin change page now displays original object(s) correctly. Thanks for reporting, mordaha
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-29 05:54:56 +00:00
Adrian Holovaty 5de6fe1b2d Fixed #938 -- Fixed bug in admin model docs with OneToOneField
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 23:43:35 +00:00
Adrian Holovaty 6a36699818 Fixed #917 -- Made admin change_list view overridable by custom templates
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 20:25:56 +00:00
Adrian Holovaty 2e7e19e0f2 Moved parts/admin/doc.py to contrib/admin/utils.py, where it belongs. Also caught docutils ImportError in a more controlled way
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 17:20:43 +00:00
Adrian Holovaty f237936a87 Fixed #928 -- Fixed admin documentation breakage after [1443]. Thanks for reporting, nesh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 17:14:11 +00:00
Adrian Holovaty 3ede006fc9 Fixed #911 -- Made template system scoped to the parser instead of the template module. Also changed the way tags/filters are registered and added support for multiple arguments to {% load %} tag. Thanks, rjwittams. This is a backwards-incompatible change for people who've created custom template tags or filters. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 22:46:31 +00:00
Adrian Holovaty 37a0c110e2 Fixed #913 -- Made more helpful error for list_filter error. Thanks, Tom Tobin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 06:42:28 +00:00
Adrian Holovaty 9dda4abee1 MERGED NEW-ADMIN BRANCH (except for po/mo files, which will come in a separate commit)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 21:20:09 +00:00
Adrian Holovaty baba996254 Added translation strings to django/contrib/admin/views/decorators.py. Taken from new-admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 02:18:37 +00:00
Adrian Holovaty 6303141fbb Applied translation strings from new-admin to contrib.admin.views.doc
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 17:02:38 +00:00
Adrian Holovaty 7a80b2cc98 Fixed bug for OneToOneFields in the admin -- the manipulator_validator_unique wasn't doing the correct lookup
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-21 01:39:18 +00:00
Adrian Holovaty 33ffa72e40 Fixed #827 -- For admin list_display functions without a short_description, Django now converts underscores to spaces. Thanks, Aaron Swartz
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-17 15:26:50 +00:00
Georg Bauer f3319e45e4 fixes #109 - added translation possibilities for date and time formats (and updated translation files for the new message IDs)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-12 22:08:54 +00:00
Adrian Holovaty 632b63ad76 Fixed #766 -- Custom methods in admin.list_display can now have an allow_tags attribute, which doesn't strip tags in the methods' output. Thanks, plisk
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-11 17:15:24 +00:00
Adrian Holovaty 2ef937d0fd Fixed #683 -- Lightly refactored meta.fields.Field to add an attname attribute.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-09 23:37:41 +00:00
Adrian Holovaty d4df074d41 Fixed #109 -- Created DATE_FORMAT, DATETIME_FORMAT and TIME_FORMAT settings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-06 23:49:03 +00:00
Adrian Holovaty 181ee4ae31 Added meta.Admin list_select_related option, which specifies to use select_related in the change-list query
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-05 18:14:17 +00:00
Adrian Holovaty 67d490a61d Fixed #701 -- contrib.admin.views.doc now uses get_internal_type()
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-28 03:48:33 +00:00
Adrian Holovaty 1ed99862c6 Fixed #679 -- 'collapse' admin row class is now processed correctly when more than one tuple is in the admin.fields list. Thanks, malcolm
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-25 01:47:34 +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 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
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
Adrian Holovaty b4fd513f9f Moved views.admin.main to contrib.admin.views.main. Refs #627. Note that this is still backwards-compatible, assuming people are using django.conf.urls.admin as their admin URLconf
git-svn-id: http://code.djangoproject.com/svn/django/trunk@927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 04:58:34 +00:00
Adrian Holovaty aed1930133 Moved django.views.admin.template and django.views.admin.doc to django.contrib.admin.views. Refs #627
git-svn-id: http://code.djangoproject.com/svn/django/trunk@923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 04:40:47 +00:00
Adrian Holovaty 91c67bcd45 Added django.contrib.admin, with a staff_member_required decorator and code from AdminUserRequired middleware. Refs #627
git-svn-id: http://code.djangoproject.com/svn/django/trunk@921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 04:21:07 +00:00