← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal

~ubuntu-branches/ubuntu/quantal/python-django/quantal

« back to all changes in this revision

Viewing changes to django/contrib/admin/widgets.py

Committer: Bazaar Package Importer
Author(s): Chris Lamb
Date: 2010-05-24 22:44:32 UTC
mfrom: (1.1.11 upstream) (4.4.8 sid)
Revision ID: james.westby@ubuntu.com-20100524224432-lz0tq65rhy8cov3y

Tags: 1.2.1-1

New upstream bugfix release.

files added:
tests/regressiontests/templates/templates/first

tests/regressiontests/templates/templates/first/test.html

tests/regressiontests/templates/templates/second

tests/regressiontests/templates/templates/second/test.html

files modified:
PKG-INFO

debian/changelog

django/__init__.py

django/conf/locale/pl/formats.py

django/contrib/admin/widgets.py

django/contrib/auth/management/commands/createsuperuser.py

django/contrib/auth/tests/basic.py

django/forms/extras/widgets.py

django/forms/fields.py

django/forms/forms.py

django/forms/widgets.py

django/template/loaders/cached.py

django/views/csrf.py

docs/conf.py

docs/ref/contrib/gis/tutorial.txt

docs/releases/1.2.txt

setup.py

tests/regressiontests/admin_widgets/models.py

tests/regressiontests/forms/extra.py

tests/regressiontests/forms/widgets.py

tests/regressiontests/i18n/forms.py

tests/regressiontests/templates/loaders.py

Show diffs side-by-side

added added

removed removed

django/contrib/admin/widgets.py

44

44

(name, self.verbose_name.replace('"', '\\"'), int(self.is_stacked), settings.ADMIN_MEDIA_PREFIX))

45

45

return mark_safe(u''.join(output))

46

46

47

class AdminDateWidget(forms.DateTimeInput):

47

class AdminDateWidget(forms.DateInput):

48

48

class Media:

49

49

js = (settings.ADMIN_MEDIA_PREFIX + "js/calendar.js",

50

50

settings.ADMIN_MEDIA_PREFIX + "js/admin/DateTimeShortcuts.js")

Older »