Skip to content

Commit

Permalink
added contrib app for filer
Browse files Browse the repository at this point in the history
also, two smaller fixes
  • Loading branch information
beniwohli committed Mar 19, 2012
1 parent eb4ec7e commit 41ed0eb
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 5 deletions.
7 changes: 2 additions & 5 deletions cmsplugin_text_ng/cms_plugins.py
Expand Up @@ -35,10 +35,6 @@ def get_form(self, request, obj=None, **kwargs):
else: else:
return super(TextPluginNextGeneration, self).get_form(request, obj, **kwargs) return super(TextPluginNextGeneration, self).get_form(request, obj, **kwargs)


def get_readonly_fields(self, request, obj=None):
if obj and obj.pk:
return []

def save_model(self, request, obj, form, change): def save_model(self, request, obj, form, change):
super(TextPluginNextGeneration, self).save_model(request, obj, form, change) super(TextPluginNextGeneration, self).save_model(request, obj, form, change)
for label, variable in get_variables_from_template(obj.template.path).items(): for label, variable in get_variables_from_template(obj.template.path).items():
Expand All @@ -61,7 +57,8 @@ def render(self, context, instance, placeholder):
variables = get_variables_from_template(t) variables = get_variables_from_template(t)
for label, variable in variables.items(): for label, variable in variables.items():
model_type = variable['type'] model_type = variable['type']
context[label] = model_type.objects.select_related(*model_type.select_related).get(text_ng=instance, label=label).value var, created = model_type.objects.select_related(*model_type.select_related).get_or_create(text_ng=instance, label=label)
context[label] = var.value
context.update({'body': mark_safe(t.render(context))}) context.update({'body': mark_safe(t.render(context))})
return context return context


Expand Down
2 changes: 2 additions & 0 deletions cmsplugin_text_ng/contrib/__init__.py
@@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-

2 changes: 2 additions & 0 deletions cmsplugin_text_ng/contrib/textng_filer/__init__.py
@@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-

17 changes: 17 additions & 0 deletions cmsplugin_text_ng/contrib/textng_filer/models.py
@@ -0,0 +1,17 @@
# -*- coding: utf-8 -*-

from django.utils.translation import ugettext_lazy as _

from filer.fields.image import FilerImageField

from cmsplugin_text_ng.models import TextNGVariableBase
from cmsplugin_text_ng.type_registry import register_type

class TextNGVariableFilerImage(TextNGVariableBase):
value = FilerImageField(null=True, blank=True, verbose_name=_('value'))

class Meta:
verbose_name = _('image')
verbose_name_plural = _('images')

register_type('image', TextNGVariableFilerImage)
4 changes: 4 additions & 0 deletions cmsplugin_text_ng/models.py
Expand Up @@ -55,4 +55,8 @@ class Meta:
class TextNGVariableText(TextNGVariableBase): class TextNGVariableText(TextNGVariableBase):
value = models.TextField(_('value'), null=True, blank=True) value = models.TextField(_('value'), null=True, blank=True)


class Meta:
verbose_name = _('text')
verbose_name_plural = _('texts')

register_type('text', TextNGVariableText) register_type('text', TextNGVariableText)

0 comments on commit 41ed0eb

Please sign in to comment.