pyams/pyams_content: comparison src/pyams_content/shared/common/zmi/dashboard.py

equal deleted inserted replaced

-:35afd52c902b
+:234db8f05928
 from hypatia.query import And, Or, Eq, Any
 from pyams_catalog.query import CatalogResultSet
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.container import ContainerView
 from pyams_skin.page import DefaultPageHeaderAdapter
-from pyams_skin.table import BaseTable, I18nColumn, ActionColumn
+from pyams_skin.table import BaseTable, I18nColumn, NameColumn, JsActionColumn
 from pyams_skin.viewlet.menu import MenuItem
 from pyams_template.template import template_config
 from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter
 from pyams_utils.date import format_datetime, SH_DATETIME_FORMAT
 from pyams_utils.list import unique
 @implementer(ISharedToolDashboardTable)
 class BaseDashboardTable(BaseTable):
 """Base dashboard table"""
-_title = '{0} contents'
+_single_title = '{0} content'
+_plural_title = '{0} contents'
 sortOn = None
 dt_sort_order = 'desc'
 @property
 def title(self):
-return self.request.localizer.translate(self._title).format(len(self.values))
+translate = self.request.localizer.translate
+if len(self.values) < 2:
+return translate(self._single_title).format(len(self.values))
+else:
+return translate(self._plural_title).format(len(self.values))
 @property
 def data_attributes(self):
 attributes = super(BaseDashboardTable, self).data_attributes
 attributes['table'] = {'data-ams-datatable-sorting': "{0},{1}".format(len(self.columns)-1,
 @cached_property
 def values(self):
 return tuple(super(BaseDashboardTable, self).values)
+@adapter_config(name='name', context=(Interface, IPyAMSLayer, ISharedToolDashboardTable), provides=IColumn)
+class SharedToolDashboardNameColumn(NameColumn):
+"""Shared tool dashboard name column"""
+_header = _("Title")
 @adapter_config(context=(IWfSharedContent, IPyAMSLayer, ISharedToolDashboardTable), provides=ITableElementName)
 class SharedToolDashboardContentNameAdapter(ContextRequestViewAdapter):
 """Shared tool dashboard content name adapter"""
 @property
 def name(self):
-return II18n(self.context).query_attribute('short_name', request=self.request)
+return II18n(self.context).query_attribute('title', request=self.request)
 @adapter_config(name='sequence', context=(Interface, IPyAMSLayer, ISharedToolDashboardTable), provides=IColumn)
 class SharedToolDashboardSequenceColumn(I18nColumn, GetAttrColumn):
 """Shared tool dashboard sequence ID column"""
 def getValue(self, obj):
 return str(IWorkflowState(obj).version_id)
-@adapter_config(name='urgency', context=(Interface, IPyAMSLayer, ISharedToolDashboardTable), provides=IColumn)
-class SharedToolDashboardUrgencyColumn(ActionColumn):
-"""Shared tool dashboard urgency column"""
-icon_class = 'fa fa-fw fa-exclamation-triangle txt-color-red'
-icon_hint = _("Urgent request !")
-url = '#'
-weight = 19
-def renderCell(self, item):
-state = IWorkflowState(item)
-if not state.state_urgency:
-return ''
-else:
-return super(SharedToolDashboardUrgencyColumn, self).renderCell(item)
-def get_url(self, item):
-return self.url
 @adapter_config(name='status', context=(Interface, IPyAMSLayer, ISharedToolDashboardTable), provides=IColumn)
 class SharedToolDashboardStatusColumn(I18nColumn, GetAttrColumn):
 """Shared tool dashboard status column"""
 _header = _("Status")
 weight = 20
 def getValue(self, obj):
 workflow = IWorkflow(obj)
 state = IWorkflowState(obj)
-return self.request.localizer.translate(workflow.get_state_label(state.state))
+result = self.request.localizer.translate(workflow.get_state_label(state.state))
+if state.state_urgency:
+result += ' <i class="fa fa-fw fa-exclamation-triangle txt-color-red"></i>'
+return result
 @adapter_config(name='status_date', context=(Interface, IPyAMSLayer, ISharedToolDashboardTable), provides=IColumn)
 class SharedToolDashboardStatusDateColumn(I18nColumn, GetAttrColumn):
 """Shared tool dashboard status date column"""
 @implementer(ISharedToolDashboardTable)
 class SharedToolDashboardManagerWaitingTable(BaseDashboardTable):
 """Shared tool dashboard waiting table"""
-_title = _("MANAGER - {0} content(s) waiting for your action")
+_single_title = _("MANAGER - {0} content waiting for your action")
+_plural_title = _("MANAGER - {0} contents waiting for your action")
 dt_sort_order = 'asc'
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolDashboardManagerWaitingTable), provides=IValues)
 @implementer(ISharedToolDashboardTable)
 class SharedToolDashboardOwnerWaitingTable(BaseDashboardTable):
 """Shared tool dashboard waiting owned contents table"""
-_title = _("CONTRIBUTOR - Your {0} content(s) waiting for action")
+_single_title = _("CONTRIBUTOR - {0} content waiting for action")
+_plural_title = _("CONTRIBUTOR - {0} contents waiting for action")
 dt_sort_order = 'asc'
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolDashboardOwnerWaitingTable), provides=IValues)
 @implementer(ISharedToolDashboardTable)
 class SharedToolDashboardOwnerModifiedTable(BaseDashboardTable):
 """Shared tool dashboard owned modified contents table"""
-_title = _("CONTRIBUTOR - Your last modified contents (limited to {0})")
+_single_title = _("CONTRIBUTOR - {0} modified content")
+@property
+def _plural_title(self):
+if len(self.values) <= 50:
+return _("CONTRIBUTOR - {0} modified contents")
+else:
+return _("CONTRIBUTOR - Last {0} modified contents")
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolDashboardOwnerModifiedTable), provides=IValues)
 class SharedToolDashboardOwnerModifiedValues(ContextRequestViewAdapter):
 """Shared tool dashboard waiting owned contents values adapter"""
 Or(Eq(catalog['role:owner'], self.request.principal.id),
 Eq(catalog['role:contributor'], self.request.principal.id)))
 return unique(map(lambda x: sorted(IWorkflowVersions(x).get_versions(IWorkflowState(x).state),
 key=lambda y: IZopeDublinCore(y).modified, reverse=True)[0],
 CatalogResultSet(CatalogQuery(catalog).query(params,
-limit=IAdminProfile(self.request.principal).table_page_length,
+limit=50,
 sort_index='modified_date',
 reverse=True))))
 #
 icon_class = 'fa-user'
 url = '#'
 #
+# My favorites
+# Dashboard of favorites contents
+#
+@viewlet_config(name='my-favorites.menu', context=ISharedTool, layer=IAdminLayer,
+manager=IMyDashboardMenu, permission=VIEW_SYSTEM_PERMISSION, weight=3)
+class SharedToolFavoritesMenu(MenuItem):
+"""Shared tool favorites dashboard menu"""
+label = _("My favorites")
+icon_class = None
+url = '#my-favorites.html'
+@implementer(ISharedToolDashboardTable)
+class SharedToolFavoritesTable(BaseDashboardTable):
+"""Shared tool favorites table"""
+_single_title = _("CONTRIBUTOR - {0} favorite")
+_plural_title = _("CONTRIBUTOR - {0} favorites")
+@adapter_config(name='show-hide', context=(Interface, IPyAMSLayer, SharedToolFavoritesTable),
+provides=IColumn)
+class FavoritesColumnAddRemoveColumn(JsActionColumn):
+"""Favorites column add/remove column"""
+cssClasses = {'th': 'action',
+'td': 'action switcher'}
+icon_class = 'fa fa-fw fa-star'
+icon_hint = _("Add/remove from favorites")
+url = 'PyAMS_content.profile.switchFavorite'
+weight = 1
+def __init__(self, context, request, table):
+super(FavoritesColumnAddRemoveColumn, self).__init__(context, request, table)
+self.profile = IAdminProfile(request)
+def get_icon(self, item):
+oid = ISequentialIdInfo(item).hex_oid
+icon_class = 'fa fa-fw fa-star{0}'.format('' if oid in (self.profile.favorites or ()) else '-o')
+return '<i data-ams-plugins="pyams_content" ' \
+'data-ams-plugin-pyams_content-src="/--static--/pyams_content/js/pyams_content{{MyAMS.devext}}.js" ' \
+'data-ams-click-handler="PyAMS_content.profile.switchFavorite" data-ams-stop-propagation="true" ' \
+'data-sequence-oid="{oid}" ' \
+'class="{icon_class}"></i>'.format(
+oid=oid,
+title=self.request.localizer.translate(self.icon_hint),
+icon_class=icon_class)
+def get_url(self, item):
+return ''
+@adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolFavoritesTable), provides=IValues)
+class SharedToolFavoritesValues(ContextRequestViewAdapter):
+"""Shared tool favorites values adapter"""
+@property
+def values(self):
+catalog = get_utility(ICatalog)
+profile = IAdminProfile(self.request.principal)
+params = And(Eq(catalog['content_type'], self.context.shared_content_type),
+Any(catalog['oid'], profile.favorites or ()))
+return unique(map(lambda x: IWorkflowVersions(x).get_last_versions()[0],
+CatalogResultSet(CatalogQuery(catalog).query(params,
+sort_index='modified_date',
+reverse=True))))
+@pagelet_config(name='my-favorites.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
+@implementer(IInnerPage)
+class SharedToolFavoritesView(AdminView, ContainerView):
+"""Shared tool favorites view"""
+table_class = SharedToolFavoritesTable
+@adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolFavoritesView), provides=IPageHeader)
+class SharedToolFavoritesHeaderAdapter(DefaultPageHeaderAdapter):
+"""Shared tool favorites header adapter"""
+back_url = '#dashboard.html'
+icon_class = 'fa fa-fw fa-user'
+@property
+def title(self):
+return II18n(self.context).query_attribute('title', request=self.request)
+subtitle = _("Your favorites")
+#
 # My preparations
 # Dashboard of owned and modified contents which can be updated
 #
 @viewlet_config(name='my-preparations.menu', context=ISharedTool, layer=IAdminLayer,
 manager=IMyDashboardMenu, permission=VIEW_SYSTEM_PERMISSION, weight=5)
 class SharedToolPreparationsMenu(MenuItem):
-"""Site root preparations dashboard menu"""
+"""Shared tool preparations dashboard menu"""
 label = _("My preparations")
 icon_class = None
 url = '#my-preparations.html'
 @implementer(ISharedToolDashboardTable)
 class SharedToolPreparationsTable(BaseDashboardTable):
-"""Site root preparations table"""
+"""Shared tool preparations table"""
-_title = _("CONTRIBUTOR - Your {0} prepared contents")
+_single_title = _("CONTRIBUTOR - {0} prepared content")
+_plural_title = _("CONTRIBUTOR - {0} prepared contents")
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolPreparationsTable), provides=IValues)
 class SharedToolPreparationsValues(ContextRequestViewAdapter):
-"""Site root preparations values adapter"""
+"""Shared tool preparations values adapter"""
 @property
 def values(self):
 catalog = get_utility(ICatalog)
 workflow = get_utility(IWorkflow, name=self.context.shared_content_workflow)
 params = And(Eq(catalog['content_type'], self.context.shared_content_type),
 Or(Eq(catalog['role:owner'], self.request.principal.id),
 Eq(catalog['role:contributor'], self.request.principal.id)),
-Any(catalog['workflow_state'], workflow.update_states))
+Eq(catalog['workflow_state'], workflow.initial_state))
 return unique(CatalogResultSet(CatalogQuery(catalog).query(params,
 sort_index='modified_date',
 reverse=True)))
 @pagelet_config(name='my-preparations.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
 @implementer(IInnerPage)
 class SharedToolPreparationsView(AdminView, ContainerView):
-"""Site root preparations view"""
+"""Shared tool preparations view"""
 table_class = SharedToolPreparationsTable
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolPreparationsView), provides=IPageHeader)
 class SharedToolPreparationsHeaderAdapter(DefaultPageHeaderAdapter):
-"""Site root preparations header adapter"""
+"""Shared tool preparations header adapter"""
 back_url = '#dashboard.html'
 icon_class = 'fa fa-fw fa-user'
 @property
 def title(self):
 return II18n(self.context).query_attribute('title', request=self.request)
 subtitle = _("Your prepared contents")
+#
+# My submissions
+# Dashboard of owned and modified contents which are waiting for manager action
+#
+@viewlet_config(name='my-submissions.menu', context=ISharedTool, layer=IAdminLayer,
+manager=IMyDashboardMenu, permission=VIEW_SYSTEM_PERMISSION, weight=7)
+class SharedToolSubmissionsMenu(MenuItem):
+"""Shared tool submissions dashboard menu"""
+label = _("My submissions")
+icon_class = None
+url = '#my-submissions.html'
+@implementer(ISharedToolDashboardTable)
+class SharedToolSubmissionsTable(BaseDashboardTable):
+"""Shared tool submissions table"""
+_single_title = _("CONTRIBUTOR - {0} submitted content")
+_plural_title = _("CONTRIBUTOR - {0} submitted contents")
+@adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolSubmissionsTable), provides=IValues)
+class SharedToolSubmissionsValues(ContextRequestViewAdapter):
+"""Shared tool submissions values adapter"""
+@property
+def values(self):
+catalog = get_utility(ICatalog)
+workflow = get_utility(IWorkflow, name=self.context.shared_content_workflow)
+params = And(Eq(catalog['content_type'], self.context.shared_content_type),
+Or(Eq(catalog['role:owner'], self.request.principal.id),
+Eq(catalog['role:contributor'], self.request.principal.id)),
+Any(catalog['workflow_state'], workflow.waiting_states))
+return unique(CatalogResultSet(CatalogQuery(catalog).query(params,
+sort_index='modified_date',
+reverse=True)))
+@pagelet_config(name='my-submissions.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
+@implementer(IInnerPage)
+class SharedToolSubmissionsView(AdminView, ContainerView):
+"""Shared tool submissions view"""
+table_class = SharedToolSubmissionsTable
+@adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolSubmissionsView), provides=IPageHeader)
+class SharedToolSubmissionsHeaderAdapter(DefaultPageHeaderAdapter):
+"""Shared tool submissions header adapter"""
+back_url = '#dashboard.html'
+icon_class = 'fa fa-fw fa-user'
+@property
+def title(self):
+return II18n(self.context).query_attribute('title', request=self.request)
+subtitle = _("Your submitted contents")
 #
 # My publications
 # Dashboard of owned and modified contents which are published
 @implementer(ISharedToolDashboardTable)
 class SharedToolPublicationsTable(BaseDashboardTable):
 """Shared tool publications table"""
-_title = _("CONTRIBUTOR - Your {0} published contents")
+_single_title = _("CONTRIBUTOR - {0} published content")
+_plural_title = _("CONTRIBUTOR - {0} published contents")
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolPublicationsTable), provides=IValues)
 class SharedToolPublicationsValues(ContextRequestViewAdapter):
 """Shared tool publications values adapter"""
 @implementer(ISharedToolDashboardTable)
 class SharedToolRetiredContentsTable(BaseDashboardTable):
 """Shared tool retired contents table"""
-_title = _("CONTRIBUTOR - Your {0} retired contents")
+_single_title = _("CONTRIBUTOR - {0} retired content")
+_plural_title = _("CONTRIBUTOR - {0} retired contents")
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolRetiredContentsTable), provides=IValues)
 class SharedToolRetiredContentsValues(ContextRequestViewAdapter):
 """Shared tool retired contents values adapter"""
 @implementer(ISharedToolDashboardTable)
 class SharedToolArchivedContentsTable(BaseDashboardTable):
 """Shared tool archived contents table"""
-_title = _("CONTRIBUTOR - Your {0} archived contents")
+_single_title = _("CONTRIBUTOR - {0} archived content")
+_plural_title = _("CONTRIBUTOR - {0} archived contents")
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolArchivedContentsTable), provides=IValues)
 class SharedToolArchivedContentsValues(ContextRequestViewAdapter):
 """Shared tool archived contents values adapter"""
 @implementer(ISharedToolDashboardTable)
 class SharedToolAllPublicationsTable(BaseDashboardTable):
 """Shared tool published contents table"""
-_title = _("CONTRIBUTORS - Last published contents (in the limit of 50)")
+_single_title = _("CONTRIBUTORS - {0} published content")
+@property
+def _plural_title(self):
+if len(self.values) <= 50:
+return _("CONTRIBUTORS - Last {0} published contents")
+else:
+return _("CONTRIBUTORS - Last published contents (in the limit of 50)")
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolAllPublicationsTable), provides=IValues)
 class SharedToolAllPublicationsValues(ContextRequestViewAdapter):
 """Shared tool published contents values adapter"""
 @implementer(ISharedToolDashboardTable)
 class SharedToolAllUpdatesTable(BaseDashboardTable):
 """Shared tool updated contents table"""
-_title = _("CONTRIBUTORS - Last updated contents (in the limit of 50)")
+_single_title = _("CONTRIBUTORS - {0} updated content")
+@property
+def _plural_title(self):
+if len(self.values) <= 50:
+return _("CONTRIBUTORS - Last {0} updated contents")
+else:
+return _("CONTRIBUTORS - Last updated contents (in the limit of 50)")
 @adapter_config(context=(ISharedTool, IPyAMSLayer, SharedToolAllUpdatesTable), provides=IValues)
 class SharedToolAllUpdatesValues(ContextRequestViewAdapter):
 """Shared tool updated contents values adapter"""

changeset 14	234db8f05928
parent 0	7c0001cacf8e
child 24	b5882159dea4