Changeset 4455 for django/branches/sqlalchemy/django

Timestamp:

01/31/07 17:43:09 (2 years ago)

Author:

rmunn

Message:

Merged revisions 4186 to 4454 from trunk.

Files:

• django/branches/sqlalchemy/django/bin/compile-messages.py (modified) (1 prop)
• django/branches/sqlalchemy/django/bin/daily_cleanup.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/bin/django-admin.py (modified) (1 prop)
• django/branches/sqlalchemy/django/bin/make-messages.py (modified) (1 prop)
• django/branches/sqlalchemy/django/bin/profiling/gather_profile_stats.py (modified) (1 prop)
• django/branches/sqlalchemy/django/bin/profiling/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/bin/unique-messages.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/app_template/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/app_template/models.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/app_template/views.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/global_settings.py (modified) (1 diff)
• django/branches/sqlalchemy/django/conf/project_template/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/project_template/manage.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/project_template/settings.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/conf/project_template/urls.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/urls/admin_password_reset.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/urls/defaults.py (modified) (1 prop)
• django/branches/sqlalchemy/django/conf/urls/i18n.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/filterspecs.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/models.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/templates/admin/auth/user/change_password.html (copied) (copied from django/trunk/django/contrib/admin/templates/admin/auth/user/change_password.html)
• django/branches/sqlalchemy/django/contrib/admin/templates/admin/base.html (modified) (1 diff)
• django/branches/sqlalchemy/django/contrib/admin/templates/admin/change_form.html (modified) (2 diffs)
• django/branches/sqlalchemy/django/contrib/admin/templates/admin/change_list.html (modified) (1 diff)
• django/branches/sqlalchemy/django/contrib/admin/templatetags/adminapplist.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/templatetags/admin_list.py (modified) (3 diffs, 1 prop)
• django/branches/sqlalchemy/django/contrib/admin/templatetags/adminmedia.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/templatetags/admin_modify.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/templatetags/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/urls.py (modified) (1 diff)
• django/branches/sqlalchemy/django/contrib/admin/utils.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/views/auth.py (modified) (3 diffs, 1 prop)
• django/branches/sqlalchemy/django/contrib/admin/views/decorators.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/views/doc.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/views/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/admin/views/main.py (modified) (4 diffs, 1 prop)
• django/branches/sqlalchemy/django/contrib/admin/views/template.py (modified) (2 diffs, 1 prop)
• django/branches/sqlalchemy/django/contrib/auth/backends.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/auth/create_superuser.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/auth/decorators.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/auth/forms.py (modified) (6 diffs)
• django/branches/sqlalchemy/django/contrib/auth/handlers/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/auth/handlers/modpython.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/auth/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/auth/management.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/auth/middleware.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/auth/models.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/contrib/auth/views.py (modified) (4 diffs)
• django/branches/sqlalchemy/django/contrib/comments/feeds.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/comments/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/comments/models.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/comments/templatetags/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/comments/urls/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/comments/views/comments.py (modified) (5 diffs)
• django/branches/sqlalchemy/django/contrib/comments/views/userflags.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/contenttypes/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/contenttypes/management.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/contenttypes/models.py (modified) (2 diffs, 1 prop)
• django/branches/sqlalchemy/django/contrib/csrf/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/csrf/middleware.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/contrib/flatpages/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/flatpages/middleware.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/flatpages/models.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/flatpages/urls.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/flatpages/views.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/formtools/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/formtools/preview.py (modified) (4 diffs, 1 prop)
• django/branches/sqlalchemy/django/contrib/humanize/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/humanize/templatetags/humanize.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/humanize/templatetags/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/markup/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/markup/templatetags/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/markup/templatetags/markup.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/redirects/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/redirects/middleware.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/redirects/models.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/sessions/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/sessions/middleware.py (modified) (2 diffs, 1 prop)
• django/branches/sqlalchemy/django/contrib/sessions/models.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/sitemaps/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/sitemaps/views.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/sites/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/sites/management.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/sites/managers.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/sites/models.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/syndication/feeds.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/syndication/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/contrib/syndication/views.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/cache/backends/base.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/cache/backends/db.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/cache/backends/dummy.py (modified) (2 diffs, 1 prop)
• django/branches/sqlalchemy/django/core/cache/backends/filebased.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/cache/backends/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/cache/backends/locmem.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/cache/backends/memcached.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/cache/backends/simple.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/cache/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/context_processors.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/handlers/base.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/core/handlers/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/handlers/modpython.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/handlers/profiler-hotshot.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/handlers/wsgi.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/management.py (modified) (2 diffs, 1 prop)
• django/branches/sqlalchemy/django/core/serializers/base.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/serializers/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/serializers/json.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/serializers/python.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/core/serializers/xml_serializer.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/servers/basehttp.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/servers/fastcgi.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/servers/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/core/signals.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/ado_mssql/base.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/ado_mssql/client.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/ado_mssql/creation.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/db/backends/ado_mssql/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/ado_mssql/introspection.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/dummy/base.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/dummy/client.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/dummy/creation.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/dummy/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/dummy/introspection.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/mysql/base.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/db/backends/mysql/client.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/mysql/creation.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/db/backends/mysql/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/mysql/introspection.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/oracle/base.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/oracle/client.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/oracle/creation.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/db/backends/oracle/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/oracle/introspection.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql/base.py (modified) (3 diffs, 1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql/client.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql/creation.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql/introspection.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql_psycopg2/base.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql_psycopg2/client.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql_psycopg2/creation.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql_psycopg2/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/postgresql_psycopg2/introspection.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/sqlite3/base.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/sqlite3/client.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/sqlite3/creation.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/db/backends/sqlite3/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/sqlite3/introspection.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/backends/util.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/models/base.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/models/fields/generic.py (modified) (2 diffs, 1 prop)
• django/branches/sqlalchemy/django/db/models/fields/__init__.py (modified) (25 diffs, 1 prop)
• django/branches/sqlalchemy/django/db/models/fields/related.py (modified) (15 diffs, 1 prop)
• django/branches/sqlalchemy/django/db/models/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/models/loading.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/models/manager.py (modified) (3 diffs, 1 prop)
• django/branches/sqlalchemy/django/db/models/manipulators.py (modified) (4 diffs, 1 prop)
• django/branches/sqlalchemy/django/db/models/options.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/models/query.py (modified) (11 diffs, 1 prop)
• django/branches/sqlalchemy/django/db/models/related.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/models/signals.py (modified) (1 prop)
• django/branches/sqlalchemy/django/db/transaction.py (modified) (1 prop)
• django/branches/sqlalchemy/django/dispatch/dispatcher.py (modified) (1 prop)
• django/branches/sqlalchemy/django/dispatch/errors.py (modified) (1 prop)
• django/branches/sqlalchemy/django/dispatch/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/dispatch/robustapply.py (modified) (1 prop)
• django/branches/sqlalchemy/django/dispatch/robust.py (modified) (1 prop)
• django/branches/sqlalchemy/django/dispatch/saferef.py (modified) (1 prop)
• django/branches/sqlalchemy/django/forms/__init__.py (modified) (1 diff)
• django/branches/sqlalchemy/django/middleware/cache.py (modified) (1 prop)
• django/branches/sqlalchemy/django/middleware/common.py (modified) (1 prop)
• django/branches/sqlalchemy/django/middleware/doc.py (modified) (1 prop)
• django/branches/sqlalchemy/django/middleware/gzip.py (modified) (1 prop)
• django/branches/sqlalchemy/django/middleware/http.py (modified) (1 prop)
• django/branches/sqlalchemy/django/middleware/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/middleware/locale.py (modified) (1 prop)
• django/branches/sqlalchemy/django/middleware/transaction.py (modified) (1 prop)
• django/branches/sqlalchemy/django/newforms/extras (copied) (copied from django/trunk/django/newforms/extras)
• django/branches/sqlalchemy/django/newforms/extras/__init__.py (copied) (copied from django/trunk/django/newforms/extras/__init__.py)
• django/branches/sqlalchemy/django/newforms/extras/widgets.py (copied) (copied from django/trunk/django/newforms/extras/widgets.py)
• django/branches/sqlalchemy/django/newforms/fields.py (modified) (19 diffs, 1 prop)
• django/branches/sqlalchemy/django/newforms/forms.py (modified) (12 diffs, 1 prop)
• django/branches/sqlalchemy/django/newforms/__init__.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/newforms/models.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/newforms/util.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/newforms/widgets.py (modified) (13 diffs, 1 prop)
• django/branches/sqlalchemy/django/oldforms (copied) (copied from django/trunk/django/oldforms)
• django/branches/sqlalchemy/django/oldforms/__init__.py (copied) (copied from django/trunk/django/oldforms/__init__.py)
• django/branches/sqlalchemy/django/shortcuts/__init__.py (modified) (2 diffs)
• django/branches/sqlalchemy/django/template/context.py (modified) (1 prop)
• django/branches/sqlalchemy/django/template/defaultfilters.py (modified) (2 diffs)
• django/branches/sqlalchemy/django/template/loader.py (modified) (1 prop)
• django/branches/sqlalchemy/django/template/loaders/app_directories.py (modified) (1 prop)
• django/branches/sqlalchemy/django/template/loaders/eggs.py (modified) (1 prop)
• django/branches/sqlalchemy/django/template/loaders/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/template/loader_tags.py (modified) (1 prop)
• django/branches/sqlalchemy/django/templatetags/i18n.py (modified) (1 prop)
• django/branches/sqlalchemy/django/test/client.py (modified) (1 prop)
• django/branches/sqlalchemy/django/test/doctest.py (modified) (1 prop)
• django/branches/sqlalchemy/django/test/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/test/signals.py (modified) (1 prop)
• django/branches/sqlalchemy/django/test/simple.py (modified) (1 prop)
• django/branches/sqlalchemy/django/test/testcases.py (modified) (1 prop)
• django/branches/sqlalchemy/django/test/utils.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/autoreload.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/cache.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/daemonize.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/datastructures.py (modified) (2 diffs)
• django/branches/sqlalchemy/django/utils/dateformat.py (modified) (2 diffs)
• django/branches/sqlalchemy/django/utils/decorators.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/feedgenerator.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/functional.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/images.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/itercompat.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/simplejson/decoder.py (modified) (3 diffs, 1 prop)
• django/branches/sqlalchemy/django/utils/simplejson/encoder.py (modified) (10 diffs, 1 prop)
• django/branches/sqlalchemy/django/utils/simplejson/__init__.py (modified) (8 diffs, 1 prop)
• django/branches/sqlalchemy/django/utils/simplejson/jsonfilter.py (copied) (copied from django/trunk/django/utils/simplejson/jsonfilter.py)
• django/branches/sqlalchemy/django/utils/simplejson/LICENSE.txt (modified) (1 diff)
• django/branches/sqlalchemy/django/utils/simplejson/scanner.py (modified) (1 diff, 1 prop)
• django/branches/sqlalchemy/django/utils/synch.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/termcolors.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/text.py (modified) (1 diff)
• django/branches/sqlalchemy/django/utils/_threading_local.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/translation/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/translation/trans_null.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/translation/trans_real.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/tzinfo.py (modified) (1 prop)
• django/branches/sqlalchemy/django/utils/xmlutils.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/debug.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/decorators/cache.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/decorators/gzip.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/decorators/http.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/decorators/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/decorators/vary.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/generic/create_update.py (modified) (3 diffs, 1 prop)
• django/branches/sqlalchemy/django/views/generic/date_based.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/generic/__init__.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/generic/list_detail.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/generic/simple.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/i18n.py (modified) (1 prop)
• django/branches/sqlalchemy/django/views/static.py (modified) (1 prop)

django/branches/sqlalchemy/django/bin/daily_cleanup.py

@@ +1 @@
+#!/usr/bin/env python
+
-"""
-Daily cleanup job.

django/branches/sqlalchemy/django/conf/global_settings.py

@@ -26 +26 @@
-
-# Local time zone for this installation. All choices can be found here:
-current
+8.1
-TIME_ZONE = 'America/Chicago'
-

django/branches/sqlalchemy/django/conf/project_template/settings.py

@@ -18 +18 @@
-
-# Local time zone for this installation. All choices can be found here:
-current
+8.1
-TIME_ZONE = 'America/Chicago'
-

django/branches/sqlalchemy/django/contrib/admin/templates/admin/base.html

@@ -39 +39 @@
-        {% block pretitle %}{% endblock %}
-        {% block content_title %}{% if title %}<h1>{{ title|escape }}</h1>{% endif %}{% endblock %}
-
+
+
+
+
-        {% block sidebar %}{% endblock %}
-        <br class="clear" />

django/branches/sqlalchemy/django/contrib/admin/templates/admin/change_form.html

@@ -17 +17 @@
-{% endif %}{% endblock %}
-{% block content %}<div id="content-main">
+{% block object-tools %}
-{% if change %}{% if not is_popup %}
-  <ul class="object-tools"><li><a href="history/" class="historylink">{% trans "History" %}</a></li>
@@ -22 +23 @@
-  </ul>
-{% endif %}{% endif %}
+{% endblock %}
-<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% block form_top %}{% endblock %}
-<div>

django/branches/sqlalchemy/django/contrib/admin/templates/admin/change_list.html

@@ -8 +8 @@
-{% block content %}
-<div id="content-main">
+{% block object-tools %}
-{% if has_add_permission %}
-<ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
-{% endif %}
+{% endblock %}
-<div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
-{% block search %}{% search_form cl %}{% endblock %}

django/branches/sqlalchemy/django/contrib/admin/templatetags/admin_list.py

@@ -101 +101 @@
-                       "url": cl.get_query_string({ORDER_VAR: i, ORDER_TYPE_VAR: new_order_type}),
-                       "class_attrib": (th_classes and ' class="%s"' % ' '.join(th_classes) or '')}
+
+def _boolean_icon(field_val):
+    BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
+    return '<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (settings.ADMIN_MEDIA_PREFIX, BOOLEAN_MAPPING[field_val], field_val)
-
-def items_for_result(cl, result):
@@ -115 +119 @@
-                attr = getattr(result, field_name)
-                allow_tags = getattr(attr, 'allow_tags', False)
+                boolean = getattr(attr, 'boolean', False)
-                if callable(attr):
-                    attr = attr()
-
+
+
+
+
+
-            except (AttributeError, ObjectDoesNotExist):
-                result_repr = EMPTY_CHANGELIST_VALUE
@@ -148 +157 @@
-            # Booleans are special: We use images.
-            elif isinstance(f, models.BooleanField) or isinstance(f, models.NullBooleanField):
-
-
+
-            # FloatFields are special: Zero-pad the decimals.
-            elif isinstance(f, models.FloatField):

django/branches/sqlalchemy/django/contrib/admin/urls.py

@@ -30 +30 @@
-    # "Add user" -- a special-case view
-    ('^auth/user/add/$', 'django.contrib.admin.views.auth.user_add_stage'),
+    # "Change user password" -- another special-case view
+    ('^auth/user/(\d+)/password/$', 'django.contrib.admin.views.auth.user_change_password'),
-
-    # Add/change/delete/history

django/branches/sqlalchemy/django/contrib/admin/views/auth.py

@@ -1 +1 @@
-from django.contrib.admin.views.decorators import staff_member_required
-
+, AdminPasswordChangeForm
-from django.contrib.auth.models import User
-from django.core.exceptions import PermissionDenied
-
-
+old
+, get_object_or_404
-from django.http import HttpResponseRedirect
+from django.utils.html import escape
-
-def user_add_stage(request):
@@ -25 +26 @@
-    else:
-        errors = new_data = {}
-
+old
-    return render_to_response('admin/auth/user/add_form.html', {
-        'title': _('Add user'),
@@ -43 +44 @@
-    }, context_instance=template.RequestContext(request))
-user_add_stage = staff_member_required(user_add_stage)
+
+def user_change_password(request, id):
+    if not request.user.has_perm('auth.change_user'):
+        raise PermissionDenied
+    user = get_object_or_404(User, pk=id)
+    manipulator = AdminPasswordChangeForm(user)
+    if request.method == 'POST':
+        new_data = request.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            new_user = manipulator.save(new_data)
+            msg = _('Password changed successfully.')
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect('..')
+    else:
+        errors = new_data = {}
+    form = oldforms.FormWrapper(manipulator, new_data, errors)
+    return render_to_response('admin/auth/user/change_password.html', {
+        'title': _('Change password: %s') % escape(user.username),