Changeset 469

Timestamp:

08/10/05 14:32:38 (3 years ago)

Author:

adrian

Message:

Fixed #81 -- Admin now supports primary_key=True for non-integer fields. Note that you'll have to make a change to your database if you're using a previous Django installation and want to use non-integer primary key fields. See the BackwardsIncompatibleChanges wiki page for info.

Files:

• django/trunk/django/conf/urls/admin.py (modified) (1 diff)
• django/trunk/django/core/meta/fields.py (modified) (1 diff)
• django/trunk/django/core/meta/__init__.py (modified) (2 diffs)
• django/trunk/django/models/auth.py (modified) (1 diff)
• django/trunk/django/views/admin/main.py (modified) (1 diff)

django/trunk/django/conf/urls/admin.py

@@ -51 +51 @@
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/$', 'django.views.admin.main.change_list'),
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/add/$', 'django.views.admin.main.add_stage'),
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>\d+)/$', 'django.views.admin.main.change_stage'),
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>\d+)/delete/$', 'django.views.admin.main.delete_stage'),
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>\d+)/history/$', 'django.views.admin.main.history'),
-    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/jsvalidation/$', 'django.views.admin.jsvalidation.jsvalidation'),
+    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/history/$', 'django.views.admin.main.history'),
+    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/delete/$', 'django.views.admin.main.delete_stage'),
+    ('^(?P<app_label>[^/]+)/(?P<module_name>[^/]+)/(?P<object_id>.+)/$', 'django.views.admin.main.change_stage'),
-)
-urlpatterns = patterns('', *urlpatterns)

django/trunk/django/core/meta/fields.py

@@ -180 +180 @@
-        if self.unique_for_year:
-            params['validator_list'].append(getattr(manipulator, 'isUnique%sFor%s' % (self.name, self.unique_for_year)))
-
+ or (self.primary_key and not rel)
-            params['validator_list'].append(curry(manipulator_validator_unique, self, opts, manipulator))
-

django/trunk/django/core/meta/__init__.py

@@ -1339 +1339 @@
-        self.obj_key = obj_key
-        try:
-**{'%s__exact' % opts.pk.name: obj_key}
+pk=obj_key
-        except ObjectDoesNotExist:
-            # If the object doesn't exist, this might be a manipulator for a
@@ -1359 +1359 @@
-    self.fields = []
-    for f in opts.fields + opts.many_to_many:
-
+not (f.primary_key and change) and 
-            self.fields.extend(f.get_manipulator_fields(opts, self, change))
-

django/trunk/django/models/auth.py

@@ -248 +248 @@
-        meta.ForeignKey(User),
-        meta.ForeignKey(core.ContentType, name='content_type_id', rel_name='content_type', blank=True, null=True),
-Integer
+Text
-        meta.CharField('object_repr', maxlength=200),
-        meta.PositiveSmallIntegerField('action_flag'),

django/trunk/django/views/admin/main.py

@@ -720 +720 @@
-            t.append('<label for="%s"%s>%s:</label> ' % (label_name, class_names and ' class="%s"' % ' '.join(class_names) or '', capfirst(field.verbose_name)))
-            t.append(_get_admin_field_form_widget(field, name_prefix, rel, add, change))
+        if change and field.primary_key:
+            t.append('{{ %soriginal.%s }}' % ((rel and name_prefix or ''), field.name))
-        if change and use_raw_id_admin(field):
-            obj_repr = '%soriginal.get_%s|truncatewords:"14"' % (rel and name_prefix or '', field.rel.name)