# HG changeset patch # User Thierry Florac # Date 1532013264 -7200 # Node ID 62633f571e53f1e23abd5c997e2682d186fd8a3a # Parent bddcf038737f13b553d7e3cb57c758abb58cf27e Removed custom size column diff -r bddcf038737f -r 62633f571e53 src/pyams_content/features/menu/zmi/__init__.py --- a/src/pyams_content/features/menu/zmi/__init__.py Thu Jul 19 16:46:15 2018 +0200 +++ b/src/pyams_content/features/menu/zmi/__init__.py Thu Jul 19 17:14:24 2018 +0200 @@ -17,8 +17,6 @@ import json # import interfaces -from pyams_content.component.links.zmi import InternalLinkAddMenu, InternalLinkAddForm, InternalLinkPropertiesEditForm, \ - ExternalLinkAddMenu, ExternalLinkAddForm, ExternalLinkPropertiesEditForm from pyams_content.features.menu import IMenusContainer, IMenu, Menu, IMenuLink from pyams_content.features.menu.interfaces import IMenusContainerTarget, IMenuLinksContainer, IMenuInternalLink, \ IMenuExternalLink, IMenuLinksContainerTarget @@ -33,15 +31,17 @@ # import packages from pyams_content.component.association.zmi import AssociationsTable, AssociationsTablePublicNameColumn +from pyams_content.component.links.zmi import \ + InternalLinkAddMenu, InternalLinkAddForm, InternalLinkPropertiesEditForm, \ + ExternalLinkAddMenu, ExternalLinkAddForm, ExternalLinkPropertiesEditForm from pyams_form.form import ajax_config, AJAXAddForm, AJAXEditForm from pyams_i18n.column import I18nAttrColumn from pyams_pagelet.pagelet import pagelet_config from pyams_skin.container import switch_element_visibility, delete_container_element from pyams_skin.event import get_json_switched_table_refresh_event, get_json_table_row_refresh_event -from pyams_skin.table import BaseTable, SorterColumn, VisibilitySwitcherColumn, I18nColumn, TrashColumn, NameColumn, \ - get_table_id +from pyams_skin.table import BaseTable, SorterColumn, VisibilitySwitcherColumn, I18nColumn, TrashColumn, get_table_id from pyams_skin.viewlet.toolbar import ToolbarAction -from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter, ContextAdapter, NullAdapter +from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter, ContextAdapter from pyams_utils.traversing import get_parent from pyams_utils.url import absolute_url from pyams_viewlet.viewlet import viewlet_config @@ -487,13 +487,3 @@ """Menu external link properties edit form""" edit_permission = None # managed by IFormContextPermissionChecker adapter - - -# -# Custom adapters -# - -@adapter_config(name='size', context=(IMenu, IPyAMSLayer, MenuLinksTable), provides=IColumn) -@adapter_config(name='size', context=(IMenuLinksContainerTarget, IPyAMSLayer, LinksTable), provides=IColumn) -class MenuLinksTableSizeColumn(NullAdapter): - """Menu links table size column"""