Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 4046a617935c1fa1e25d998b706af54f8ef92eef 1 parent f892464
Russell Keith-Magee authored
2  django/contrib/auth/models.py
@@ -343,7 +343,7 @@ class GroupAdmin(admin.ModelAdmin):
343 343
     filter_horizontal = ('permissions',)
344 344
 
345 345
 class UserAdmin(admin.ModelAdmin):
346  
-    fields = (
  346
+    fieldsets = (
347 347
         (None, {'fields': ('username', 'password')}),
348 348
         (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
349 349
         (_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
4  django/contrib/comments/models.py
@@ -281,7 +281,7 @@ def __repr__(self):
281 281
 from django.contrib import admin
282 282
 
283 283
 class CommentAdmin(admin.ModelAdmin):
284  
-    fields = (
  284
+    fieldsets = (
285 285
         (None, {'fields': ('content_type', 'object_id', 'site')}),
286 286
         ('Content', {'fields': ('user', 'headline', 'comment')}),
287 287
         ('Ratings', {'fields': ('rating1', 'rating2', 'rating3', 'rating4', 'rating5', 'rating6', 'rating7', 'rating8', 'valid_rating')}),
@@ -294,7 +294,7 @@ class CommentAdmin(admin.ModelAdmin):
294 294
     raw_id_fields = ('user',)
295 295
 
296 296
 class FreeCommentAdmin(admin.ModelAdmin):
297  
-    fields = (
  297
+    fieldsets = (
298 298
         (None, {'fields': ('content_type', 'object_id', 'site')}),
299 299
         ('Content', {'fields': ('person_name', 'comment')}),
300 300
         ('Meta', {'fields': ('submit_date', 'is_public', 'ip_address', 'approved')}),
2  django/contrib/flatpages/models.py
@@ -33,7 +33,7 @@ def get_absolute_url(self):
33 33
 from django.contrib import admin
34 34
 
35 35
 class FlatPageAdmin(admin.ModelAdmin):
36  
-    fields = (
  36
+    fieldsets = (
37 37
         (None, {'fields': ('url', 'title', 'content', 'sites')}),
38 38
         ('Advanced options', {'classes': 'collapse', 'fields': ('enable_comments', 'registration_required', 'template_name')}),
39 39
     )

0 notes on commit 4046a61

Please sign in to comment.
Something went wrong with that request. Please try again.