From 6f5a841e479da233f7033921b9f337d9f9a8f85f Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sun, 12 Nov 2023 15:48:45 +0100 Subject: [PATCH 1/2] Remove samplepoint backrefs from sampletypes listing --- .../lims/controlpanel/bika_sampletypes.py | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/bika/lims/controlpanel/bika_sampletypes.py b/src/bika/lims/controlpanel/bika_sampletypes.py index 9d3cec3172..5ae344a3f8 100644 --- a/src/bika/lims/controlpanel/bika_sampletypes.py +++ b/src/bika/lims/controlpanel/bika_sampletypes.py @@ -26,13 +26,13 @@ from bika.lims.catalog import SETUP_CATALOG from bika.lims.config import PROJECTNAME from bika.lims.interfaces import ISampleTypes -from senaite.core.permissions import AddSampleType from bika.lims.utils import get_link_for from plone.app.folder.folder import ATFolder from plone.app.folder.folder import ATFolderSchema from Products.Archetypes import atapi from Products.ATContentTypes.content import schemata from senaite.core.interfaces import IHideActionsMenu +from senaite.core.permissions import AddSampleType from zope.interface.declarations import implements # TODO: Separate content and view into own modules! @@ -99,9 +99,6 @@ def __init__(self, context, request): ("ContainerType", { "title": _("Default Container"), "toggle": True}), - ("SamplePoints", { - "title": _("Sample Points"), - "toggle": True}), )) self.review_states = [ @@ -165,21 +162,6 @@ def folderitem(self, obj, item, index): vol = obj.getMinimumVolume() item["getMinimumVolume"] = vol - # Hide sample points assigned to this sample type that do not belong - # to the same container (Client or Setup) - sample_points = obj.getSamplePoints() - path = api.get_path(self.context) - setup = api.get_setup() - if api.get_parent(self.context) == setup: - path = api.get_path(setup.bika_samplepoints) - - sample_points = filter(lambda sp: api.get_parent_path(sp) == path, - sample_points) - - # Display the links to the sample points - links = map(get_link_for, sample_points) - item["replace"]["SamplePoints"] = ", ".join(links) - return item From ca1cadfe402d2640c114787cab88947198240b67 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sun, 12 Nov 2023 15:56:37 +0100 Subject: [PATCH 2/2] Changelog updated --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 294353fea4..3e543acb01 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ Changelog 2.5.0 (unreleased) ------------------ +- #2421 Fix hanging sampletype listing view in setup - #2416 Fix Template select empties existing Sample Type-, Point- and Profile values in sample add form - #2414 Fix missing empty selection in result option choices when no default value is set - #2415 Fix sample specs get overwritten on manage analyses save