Skip to content

Fixes to work with FeinCMS 1.8. #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mick-t wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes to work with FeinCMS 1.8. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d85f820
Fixes for latest feincms.
mick-t Apr 9, 2014
3ddd3df
The module feincms.admin.editor has been removed. Import the classes …
mick-t Apr 9, 2014
1725fd5
Adding requirements.txt file that specifies FeinCMS>=1.8 .
mick-t Apr 9, 2014
ec3f2d3
Remove 'collapse' from NewsletterAdmin as all the fields are required…
mick-t Apr 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pennyblack/models/newsletter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
from django.utils import translation
from django.utils.translation import ugettext_lazy as _

from feincms.admin import editor
# gone from feincms 1.9.+
# from feincms.admin import editor
from feincms.admin import item_editor
from feincms.management.checker import check_database_schema
from feincms.models import Base
Expand Down Expand Up @@ -222,15 +223,14 @@ def get_view_link(cls, identifier):
Newsletter.__module__ = 'pennyblack.models'
signals.post_syncdb.connect(check_database_schema(Newsletter, __name__), weak=False)

class NewsletterAdmin(editor.ItemEditor, admin.ModelAdmin):
class NewsletterAdmin(item_editor.ItemEditor, admin.ModelAdmin):
list_display = ('name', 'subject', 'language', 'newsletter_type')
raw_id_fields = ('header_image',)
fieldsets = (
(None, {
'fields': ['name', 'subject', 'sender', 'reply_email', 'template_key'],
}),
(_('Other options'), {
'classes': ['collapse',],
'fields': ('newsletter_type', 'language', 'utm_source','utm_medium', 'header_image', 'header_url', 'site'),
}),
item_editor.FEINCMS_CONTENT_FIELDSET,
Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# minimum feincms version:
FeinCMS>=1.8