src/pyams_content/component/illustration/__init__.py
changeset 536 1e10e634ec13
parent 501 3407e6940f6a
child 555 8e8a14452567
--- a/src/pyams_content/component/illustration/__init__.py	Fri Apr 13 14:33:15 2018 +0200
+++ b/src/pyams_content/component/illustration/__init__.py	Wed Apr 25 16:20:15 2018 +0200
@@ -52,13 +52,11 @@
 class Illustration(Persistent, Contained, RenderedContentMixin):
     """Illustration persistent class"""
 
+    _data = I18nFileProperty(IIllustration['data'])
     title = FieldProperty(IIllustration['title'])
     alt_title = FieldProperty(IIllustration['alt_title'])
     description = FieldProperty(IIllustration['description'])
     author = FieldProperty(IIllustration['author'])
-    _data = I18nFileProperty(IIllustration['data'])
-    filename = FieldProperty(IIllustration['filename'])
-    language = FieldProperty(IIllustration['language'])
     renderer = FieldProperty(IIllustration['renderer'])
 
     @property
@@ -98,11 +96,6 @@
             info = IFileInfo(data)
             info.title = II18n(illustration).get_attribute('title', lang, request)
             info.description = II18n(illustration).get_attribute('alt_title', lang, request)
-            if not illustration.filename:
-                illustration.filename = info.filename
-            else:
-                info.filename = illustration.filename
-            info.language = illustration.language
 
 
 @subscriber(IObjectAddedEvent, context_selector=IIllustration)
@@ -169,7 +162,7 @@
                         output.append(missing_lang_value.format(field=translate(IIllustration[attr].title),
                                                                 lang=lang))
         if has_data:
-            for attr in ('author', 'filename'):
+            for attr in ('author', ):
                 value = getattr(self.context, attr)
                 if not value:
                     output.append(missing_value.format(field=translate(IIllustration[attr].title)))