diff --git a/HISTORY.rst b/HISTORY.rst index ea5a4cef25..9ecf64d934 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -11,6 +11,8 @@ settings. - Update TemplateField to concatenate existing help texts. - Don't show the edit and delete links for resolved web links. +- Exclude Smart link setup columns and links from the resolved + smart link views. 3.3.4 (2019-12-09) ================== diff --git a/mayan/apps/linking/apps.py b/mayan/apps/linking/apps.py index 74acba3add..02a450ae49 100644 --- a/mayan/apps/linking/apps.py +++ b/mayan/apps/linking/apps.py @@ -75,18 +75,20 @@ class LinkingApp(MayanAppConfig): ) ) - SourceColumn( + source_column_smart_link_label = SourceColumn( attribute='label', is_identifier=True, is_sortable=True, source=SmartLink ) - SourceColumn( + source_column_smart_link_label.add_exclude(ResolvedSmartLink) + source_column_smart_link_dynamic_label = SourceColumn( attribute='dynamic_label', is_sortable=True, source=SmartLink ) - SourceColumn( + source_column_smart_link_dynamic_label.add_exclude(ResolvedSmartLink) + source_column_smart_link_enabled = SourceColumn( attribute='enabled', is_sortable=True, source=SmartLink, widget=TwoStateWidget ) - + source_column_smart_link_enabled.add_exclude(ResolvedSmartLink) SourceColumn( attribute='get_full_label', is_identifier=True, source=SmartLinkCondition @@ -126,6 +128,10 @@ class LinkingApp(MayanAppConfig): links=(link_smart_link_instance_view,), sources=(ResolvedSmartLink,) ) + menu_object.unbind_links( + links=(link_smart_link_delete, link_smart_link_edit,), + sources=(ResolvedSmartLink,) + ) menu_secondary.bind_links( links=(link_smart_link_list, link_smart_link_create), sources=(