Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Replaced PlaceholderAdmin against PlaceholderAdminMixin in unit tests

  • Loading branch information...
commit 2aa7f691c70f27368819d005a6972950cd91be7f 1 parent 2a2c66c
@jrief authored
View
8 cms/test_utils/project/placeholderapp/admin.py
@@ -1,19 +1,19 @@
-from cms.admin.placeholderadmin import PlaceholderAdmin, FrontendEditableAdmin
+from cms.admin.placeholderadmin import PlaceholderAdminMixin, FrontendEditableAdmin
from cms.test_utils.project.placeholderapp.models import (Example1, MultilingualExample1, TwoPlaceholderExample)
from django.contrib import admin
from hvad.admin import TranslatableAdmin
-class ExampleAdmin(FrontendEditableAdmin, PlaceholderAdmin):
+class ExampleAdmin(FrontendEditableAdmin, PlaceholderAdminMixin, admin.ModelAdmin):
frontend_editable_fields = ("char_1", "char_2")
-class TwoPlaceholderExampleAdmin(PlaceholderAdmin):
+class TwoPlaceholderExampleAdmin(PlaceholderAdminMixin, admin.ModelAdmin):
pass
class MultilingualAdmin(FrontendEditableAdmin, TranslatableAdmin,
- PlaceholderAdmin):
+ PlaceholderAdminMixin, admin.ModelAdmin):
frontend_editable_fields = ("char_1", "char_2")
View
4 cms/test_utils/project/sampleapp/admin.py
@@ -1,11 +1,11 @@
-from cms.admin.placeholderadmin import PlaceholderAdmin
+from cms.admin.placeholderadmin import PlaceholderAdminMixin
from django.contrib import admin
from cms.test_utils.project.sampleapp.models import Picture, Category
class PictureInline(admin.StackedInline):
model = Picture
-class CategoryAdmin(PlaceholderAdmin):
+class CategoryAdmin(PlaceholderAdminMixin, admin.ModelAdmin):
inlines = [PictureInline]
admin.site.register(Category, CategoryAdmin)
Please sign in to comment.
Something went wrong with that request. Please try again.