summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2007-09-12 01:22:13 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2007-09-12 01:22:13 +0000
commit4046a617935c1fa1e25d998b706af54f8ef92eef (patch)
tree8e799b0222d7183f103560bcd9022ed6e8077484
parentf892464d58c4029e71f4ee0b4df08a724004d4eb (diff)
newforms-admin: Fixed #5402 -- Updated some model options to reflect the renaming of fields to fieldsets in [6080]. Thanks to Petr Marhoun <petr.marhoun@gmail.com> for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/auth/models.py2
-rw-r--r--django/contrib/comments/models.py4
-rw-r--r--django/contrib/flatpages/models.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 0b29311dbc..bf661b8a96 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -343,7 +343,7 @@ class GroupAdmin(admin.ModelAdmin):
filter_horizontal = ('permissions',)
class UserAdmin(admin.ModelAdmin):
- fields = (
+ fieldsets = (
(None, {'fields': ('username', 'password')}),
(_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
(_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
diff --git a/django/contrib/comments/models.py b/django/contrib/comments/models.py
index dea40cb602..6658c9486a 100644
--- a/django/contrib/comments/models.py
+++ b/django/contrib/comments/models.py
@@ -281,7 +281,7 @@ class ModeratorDeletion(models.Model):
from django.contrib import admin
class CommentAdmin(admin.ModelAdmin):
- fields = (
+ fieldsets = (
(None, {'fields': ('content_type', 'object_id', 'site')}),
('Content', {'fields': ('user', 'headline', 'comment')}),
('Ratings', {'fields': ('rating1', 'rating2', 'rating3', 'rating4', 'rating5', 'rating6', 'rating7', 'rating8', 'valid_rating')}),
@@ -294,7 +294,7 @@ class CommentAdmin(admin.ModelAdmin):
raw_id_fields = ('user',)
class FreeCommentAdmin(admin.ModelAdmin):
- fields = (
+ fieldsets = (
(None, {'fields': ('content_type', 'object_id', 'site')}),
('Content', {'fields': ('person_name', 'comment')}),
('Meta', {'fields': ('submit_date', 'is_public', 'ip_address', 'approved')}),
diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py
index be75a22818..f2be360ff3 100644
--- a/django/contrib/flatpages/models.py
+++ b/django/contrib/flatpages/models.py
@@ -33,7 +33,7 @@ class FlatPage(models.Model):
from django.contrib import admin
class FlatPageAdmin(admin.ModelAdmin):
- fields = (
+ fieldsets = (
(None, {'fields': ('url', 'title', 'content', 'sites')}),
('Advanced options', {'classes': 'collapse', 'fields': ('enable_comments', 'registration_required', 'template_name')}),
)