--- a/src/pyams_content/component/extfile/zmi/__init__.py Mon Sep 11 14:53:15 2017 +0200
+++ b/src/pyams_content/component/extfile/zmi/__init__.py Mon Sep 11 14:54:30 2017 +0200
@@ -16,25 +16,21 @@
# import standard library
# import interfaces
-from pyams_content.component.extfile.interfaces import IExtFileContainer, IExtFileContainerTarget, IBaseExtFile, \
- IExtFile, IExtImage
+from pyams_content.component.association.interfaces import IAssociationContainer
+from pyams_content.component.association.zmi.interfaces import IAssociationsView
+from pyams_content.component.extfile.interfaces import IExtFileContainerTarget, IBaseExtFile, \
+ IExtFile, IExtImage, IExtVideo, IExtAudio
from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION
-from pyams_file.interfaces import IFileInfo
-from pyams_i18n.interfaces import INegotiator, II18n
-from pyams_skin.interfaces.viewlet import IWidgetTitleViewletManager
+from pyams_skin.interfaces.viewlet import IToolbarAddingMenu
from pyams_skin.layer import IPyAMSLayer
from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION
-from z3c.form.interfaces import NOT_CHANGED
# import packages
+from pyams_content.component.association.zmi import AssociationItemAJAXAddForm, AssociationItemAJAXEditForm
from pyams_content.component.extfile import EXTERNAL_FILES_FACTORIES
-from pyams_content.component.extfile.zmi.container import ExtFileContainerView
-from pyams_form.form import AJAXAddForm, AJAXEditForm
from pyams_form.security import ProtectedFormObjectMixin
from pyams_pagelet.pagelet import pagelet_config
-from pyams_skin.viewlet.toolbar import ToolbarAction
-from pyams_utils.registry import query_utility
-from pyams_utils.traversing import get_parent
+from pyams_skin.viewlet.toolbar import ToolbarMenuItem, ToolbarMenuDivider
from pyams_viewlet.viewlet import viewlet_config
from pyams_zmi.form import AdminDialogAddForm, AdminDialogEditForm
from pyramid.view import view_config
@@ -58,12 +54,19 @@
required=True)
-@viewlet_config(name='add-extfile.menu', context=IExtFileContainerTarget, view=ExtFileContainerView,
- layer=IPyAMSLayer, manager=IWidgetTitleViewletManager, weight=50)
-class ExtFileAddMenu(ProtectedFormObjectMixin, ToolbarAction):
+@viewlet_config(name='add-extfile.divider', context=IExtFileContainerTarget, view=IAssociationsView,
+ layer=IPyAMSLayer, manager=IToolbarAddingMenu, weight=59)
+class ExtFileAddMenuDivider(ToolbarMenuDivider):
+ """External file add menu divider"""
+
+
+@viewlet_config(name='add-extfile.menu', context=IExtFileContainerTarget, view=IAssociationsView,
+ layer=IPyAMSLayer, manager=IToolbarAddingMenu, weight=60)
+class ExtFileAddMenu(ProtectedFormObjectMixin, ToolbarMenuItem):
"""External file add menu"""
label = _("Add external file")
+ label_css_class = 'fa fa-fw fa-file-o'
url = 'add-extfile.html'
modal_target = True
@@ -75,19 +78,10 @@
"""External file add form"""
legend = _("Add new external file")
- icon_css_class = 'fa fa-fw fa-file-text-o'
-
- fields = field.Fields(IExtFileFactoryChooser) + \
- field.Fields(IExtFile).omit('__parent__', '__name__')
+ icon_css_class = 'fa fa-fw fa-file-o'
- @property
- def ajax_handler(self):
- origin = self.request.params.get('origin')
- if origin == 'link':
- return 'add-extfile-link.json'
- else:
- return 'add-extfile.json'
-
+ fields = field.Fields(IExtFile).select('title', 'description', 'author', 'language', 'data', 'filename')
+ ajax_handler = 'add-extfile.json'
edit_permission = MANAGE_CONTENT_PERMISSION
def updateWidgets(self, prefix=None):
@@ -96,66 +90,29 @@
self.widgets['description'].widget_css_class = 'textarea'
def create(self, data):
- factory = EXTERNAL_FILES_FACTORIES.get(data.get('factory'))
+ factory = EXTERNAL_FILES_FACTORIES.get('file')
if factory is not None:
return factory[0]()
- def update_content(self, content, data):
- data['factory'] = NOT_CHANGED
- return super(ExtFileAddForm, self).update_content(content, data)
-
def add(self, object):
- IExtFileContainer(self.context)['none'] = object
- i18n = query_utility(INegotiator)
- if i18n is not None:
- lang = i18n.server_language
- data = II18n(object).get_attribute('data', lang, self.request)
- if data:
- info = IFileInfo(data)
- info.title = II18n(object).get_attribute('title', lang, self.request)
- info.description = II18n(object).get_attribute('description', lang, self.request)
- for lang, data in object.data.items():
- if data is not None:
- IFileInfo(data).language = lang
+ IAssociationContainer(self.context).append(object)
@view_config(name='add-extfile.json', context=IExtFileContainerTarget, request_type=IPyAMSLayer,
permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ExtFileAJAXAddForm(AJAXAddForm, ExtFileAddForm):
+class ExtFileAJAXAddForm(AssociationItemAJAXAddForm, ExtFileAddForm):
"""External file add form, JSON renderer"""
- def get_ajax_output(self, changes):
- return {'status': 'reload',
- 'location': '#external-files.html'}
-
-
-@view_config(name='add-extfile-link.json', context=IExtFileContainerTarget, request_type=IPyAMSLayer,
- permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ExtFileLinkAJAXAddForm(AJAXAddForm, ExtFileAddForm):
- """External file link add form, JSON renderer"""
-
- def get_ajax_output(self, changes):
- target = get_parent(self.context, IExtFileContainerTarget)
- container = IExtFileContainer(target)
- files = [{'id': file.__name__,
- 'text': II18n(file).query_attribute('title', request=self.request)}
- for file in container.values()]
- return {'status': 'callback',
- 'callback': 'PyAMS_content.extfiles.refresh',
- 'options': {'files': files,
- 'new_file': {'id': changes.__name__,
- 'text': II18n(changes).query_attribute('title', request=self.request)}}}
-
@pagelet_config(name='properties.html', context=IExtFile, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
class ExtFilePropertiesEditForm(AdminDialogEditForm):
"""External file properties edit form"""
legend = _("Update file properties")
- icon_css_class = 'fa fa-fw fa-file-text-o'
+ icon_css_class = 'fa fa-fw fa-file-o'
dialog_class = 'modal-large'
- fields = field.Fields(IExtFile).omit('__parent__', '__file__')
+ fields = field.Fields(IExtFile).select('title', 'description', 'author', 'language', 'data', 'filename')
ajax_handler = 'properties.json'
edit_permission = MANAGE_CONTENT_PERMISSION
@@ -164,21 +121,59 @@
if 'description' in self.widgets:
self.widgets['description'].widget_css_class = 'textarea'
- def update_content(self, content, data):
- changes = super(ExtFilePropertiesEditForm, self).update_content(content, data)
- if changes:
- i18n = query_utility(INegotiator)
- if i18n is not None:
- lang = i18n.server_language
- data = II18n(content).get_attribute('data', lang, self.request)
- if data:
- info = IFileInfo(data)
- info.title = II18n(content).get_attribute('title', lang, self.request)
- info.description = II18n(content).get_attribute('description', lang, self.request)
- for lang, data in content.data.items():
- if data and not IFileInfo(data).language:
- IFileInfo(data).language = lang
- return changes
+
+@view_config(name='properties.json', context=IExtFile, request_type=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
+class ExtFilePropertiesAJAXEditForm(AssociationItemAJAXEditForm, ExtFilePropertiesEditForm):
+ """External file properties edit form, JSON renderer"""
+
+ def get_ajax_output(self, changes):
+ if ('title' in changes.get(IBaseExtFile, ())) or \
+ ('filename' in changes.get(IBaseExtFile, ())) or \
+ ('data' in changes.get(IExtFile, ())):
+ return self.get_associations_table()
+ else:
+ return super(ExtFilePropertiesAJAXEditForm, self).get_ajax_output(changes)
+
+
+#
+# Images views
+#
+
+@viewlet_config(name='add-extimage.menu', context=IExtFileContainerTarget, view=IAssociationsView,
+ layer=IPyAMSLayer, manager=IToolbarAddingMenu, weight=61)
+class ExtImageAddMenu(ProtectedFormObjectMixin, ToolbarMenuItem):
+ """External image add menu"""
+
+ label = _("Add image")
+ label_css_class = 'fa fa-fw fa-file-image-o'
+
+ url = 'add-extimage.html'
+ modal_target = True
+
+
+@pagelet_config(name='add-extimage.html', context=IExtFileContainerTarget, layer=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION)
+class ExtImageAddForm(ExtFileAddForm):
+ """External image add form"""
+
+ legend = _("Add new image")
+ icon_css_class = 'fa fa-fw fa-file-image-o'
+
+ fields = field.Fields(IExtImage).select('title', 'alt_title', 'description', 'author',
+ 'language', 'data', 'filename')
+ ajax_handler = 'add-extimage.json'
+
+ def create(self, data):
+ factory = EXTERNAL_FILES_FACTORIES.get('image')
+ if factory is not None:
+ return factory[0]()
+
+
+@view_config(name='add-extimage.json', context=IExtFileContainerTarget, request_type=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
+class ExtImageAJAXAddForm(AssociationItemAJAXAddForm, ExtImageAddForm):
+ """External image add form, JSON renderer"""
@pagelet_config(name='properties.html', context=IExtImage, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
@@ -186,20 +181,147 @@
"""External image properties edit form"""
legend = _("Update image properties")
- icon_css_class = 'fa fa-fw fa-picture-o'
+ icon_css_class = 'fa fa-fw fa-file-image-o'
- fields = field.Fields(IExtImage).omit('__parent__', '__name__')
+ fields = field.Fields(IExtImage).select('title', 'alt_title', 'description', 'author',
+ 'language', 'data', 'filename')
-@view_config(name='properties.json', context=IExtFile, request_type=IPyAMSLayer,
+@view_config(name='properties.json', context=IExtImage, request_type=IPyAMSLayer,
permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ExtFilePropertiesAJAXEditForm(AJAXEditForm, ExtFilePropertiesEditForm):
- """External file properties edit form, JSON renderer"""
+class ExtImagePropertiesAJAXEditForm(AssociationItemAJAXEditForm, ExtImagePropertiesEditForm):
+ """External image properties edit form, JSON renderer"""
def get_ajax_output(self, changes):
if ('title' in changes.get(IBaseExtFile, ())) or \
+ ('filename' in changes.get(IBaseExtFile, ())) or \
('data' in changes.get(IExtFile, ())):
- return {'status': 'reload',
- 'location': '#external-files.html'}
+ return self.get_associations_table()
+ else:
+ return super(ExtImagePropertiesAJAXEditForm, self).get_ajax_output(changes)
+
+
+#
+# Videos views
+#
+
+@viewlet_config(name='add-extvideo.menu', context=IExtFileContainerTarget, view=IAssociationsView,
+ layer=IPyAMSLayer, manager=IToolbarAddingMenu, weight=62)
+class ExtVideoAddMenu(ProtectedFormObjectMixin, ToolbarMenuItem):
+ """External video add menu"""
+
+ label = _("Add video")
+ label_css_class = 'fa fa-fw fa-file-video-o'
+
+ url = 'add-extvideo.html'
+ modal_target = True
+
+
+@pagelet_config(name='add-extvideo.html', context=IExtFileContainerTarget, layer=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION)
+class ExtVideoAddForm(ExtFileAddForm):
+ """External video add form"""
+
+ legend = _("Add new video")
+ icon_css_class = 'fa fa-fw fa-file-video-o'
+
+ fields = field.Fields(IExtVideo).select('title', 'description', 'author', 'language', 'data', 'filename')
+ ajax_handler = 'add-extvideo.json'
+
+ def create(self, data):
+ factory = EXTERNAL_FILES_FACTORIES.get('video')
+ if factory is not None:
+ return factory[0]()
+
+
+@view_config(name='add-extvideo.json', context=IExtFileContainerTarget, request_type=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
+class ExtVideoAJAXAddForm(AssociationItemAJAXAddForm, ExtVideoAddForm):
+ """External video add form, JSON renderer"""
+
+
+@pagelet_config(name='properties.html', context=IExtVideo, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
+class ExtVideoPropertiesEditForm(ExtFilePropertiesEditForm):
+ """External video properties edit form"""
+
+ legend = _("Update video properties")
+ icon_css_class = 'fa fa-fw fa-file-video-o'
+
+ fields = field.Fields(IExtVideo).select('title', 'description', 'author', 'language', 'data', 'filename')
+
+
+@view_config(name='properties.json', context=IExtVideo, request_type=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
+class ExtVideoPropertiesAJAXEditForm(AssociationItemAJAXEditForm, ExtVideoPropertiesEditForm):
+ """External video properties edit form, JSON renderer"""
+
+ def get_ajax_output(self, changes):
+ if ('title' in changes.get(IBaseExtFile, ())) or \
+ ('filename' in changes.get(IBaseExtFile, ())) or \
+ ('data' in changes.get(IExtFile, ())):
+ return self.get_associations_table()
else:
- return super(ExtFilePropertiesAJAXEditForm, self).get_ajax_output(changes)
+ return super(ExtVideoPropertiesAJAXEditForm, self).get_ajax_output(changes)
+
+
+#
+# Audio file views
+#
+
+@viewlet_config(name='add-extaudio.menu', context=IExtFileContainerTarget, view=IAssociationsView,
+ layer=IPyAMSLayer, manager=IToolbarAddingMenu, weight=63)
+class ExtAudioAddMenu(ProtectedFormObjectMixin, ToolbarMenuItem):
+ """External audio file add menu"""
+
+ label = _("Add audio file")
+ label_css_class = 'fa fa-fw fa-file-audio-o'
+
+ url = 'add-extaudio.html'
+ modal_target = True
+
+
+@pagelet_config(name='add-extaudio.html', context=IExtFileContainerTarget, layer=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION)
+class ExtAudioAddForm(ExtFileAddForm):
+ """External audio file add form"""
+
+ legend = _("Add new audio file")
+ icon_css_class = 'fa fa-fw fa-file-audio-o'
+
+ fields = field.Fields(IExtAudio).select('title', 'description', 'author', 'language', 'data', 'filename')
+ ajax_handler = 'add-extaudio.json'
+
+ def create(self, data):
+ factory = EXTERNAL_FILES_FACTORIES.get('audio')
+ if factory is not None:
+ return factory[0]()
+
+
+@view_config(name='add-extaudio.json', context=IExtFileContainerTarget, request_type=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
+class ExtAudioAJAXAddForm(AssociationItemAJAXAddForm, ExtAudioAddForm):
+ """External audio file add form, JSON renderer"""
+
+
+@pagelet_config(name='properties.html', context=IExtAudio, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
+class ExtAudioPropertiesEditForm(ExtFilePropertiesEditForm):
+ """External audio file properties edit form"""
+
+ legend = _("Update audio file properties")
+ icon_css_class = 'fa fa-fw fa-file-audio-o'
+
+ fields = field.Fields(IExtVideo).select('title', 'description', 'author', 'language', 'data', 'filename')
+
+
+@view_config(name='properties.json', context=IExtAudio, request_type=IPyAMSLayer,
+ permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
+class ExtAudioPropertiesAJAXEditForm(AssociationItemAJAXEditForm, ExtAudioPropertiesEditForm):
+ """External audio file properties edit form, JSON renderer"""
+
+ def get_ajax_output(self, changes):
+ if ('title' in changes.get(IBaseExtFile, ())) or \
+ ('filename' in changes.get(IBaseExtFile, ())) or \
+ ('data' in changes.get(IExtFile, ())):
+ return self.get_associations_table()
+ else:
+ return super(ExtAudioPropertiesAJAXEditForm, self).get_ajax_output(changes)