From 9b3349f2586f91cfa69f047f30ef1c6dd3f358c3 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Thu, 7 Dec 2017 15:12:52 +0100
Subject: [PATCH 1/3] Use AT reference widget

---
 CHANGES.rst                      | 1 +
 bika/lims/content/samplepoint.py | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cd8915baef..a7c61ec974 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -12,6 +12,7 @@ Changelog
 
 **Fixed**
 
+- #453 Sample points do not show the referenced sample types in view
 - #450 Traceback after clicking "Manage Results" in a WS w/o Analyses assigned
 - #445 Fix AR Add Form: No sample points are found if a sample type was set
 
diff --git a/bika/lims/content/samplepoint.py b/bika/lims/content/samplepoint.py
index f9713ea770..260e7c3ef8 100644
--- a/bika/lims/content/samplepoint.py
+++ b/bika/lims/content/samplepoint.py
@@ -10,11 +10,10 @@
 from Products.Archetypes.public import BaseContent
 from Products.Archetypes.public import BooleanField
 from Products.Archetypes.public import BooleanWidget
-from Products.Archetypes.public import ComputedField
-from Products.Archetypes.public import ComputedWidget
 from Products.Archetypes.public import DisplayList
 from Products.Archetypes.public import FileWidget
 from Products.Archetypes.public import ReferenceField
+from Products.Archetypes.public import ReferenceWidget
 from Products.Archetypes.public import Schema
 from Products.Archetypes.public import StringField
 from Products.Archetypes.public import StringWidget
@@ -30,7 +29,6 @@
 from bika.lims.browser.fields import DurationField
 from bika.lims.browser.widgets import CoordinateWidget
 from bika.lims.browser.widgets import DurationWidget
-from bika.lims.browser.widgets.referencewidget import ReferenceWidget as brw
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
 
@@ -79,7 +77,7 @@
         allowed_types=('SampleType',),
         vocabulary='SampleTypesVocabulary',
         relationship='SamplePointSampleType',
-        widget=brw(
+        widget=ReferenceWidget(
             label=_("Sample Types"),
             description=_("The list of sample types that can be collected "
                           "at this sample point.  If no sample types are "

From bbe5fec18140432f2b2fb94426f05bba8217d0ea Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Tue, 12 Dec 2017 12:06:47 +0100
Subject: [PATCH 2/3] Back to Bika Referencewidget

---
 bika/lims/content/samplepoint.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bika/lims/content/samplepoint.py b/bika/lims/content/samplepoint.py
index 260e7c3ef8..e00fba346d 100644
--- a/bika/lims/content/samplepoint.py
+++ b/bika/lims/content/samplepoint.py
@@ -13,7 +13,6 @@
 from Products.Archetypes.public import DisplayList
 from Products.Archetypes.public import FileWidget
 from Products.Archetypes.public import ReferenceField
-from Products.Archetypes.public import ReferenceWidget
 from Products.Archetypes.public import Schema
 from Products.Archetypes.public import StringField
 from Products.Archetypes.public import StringWidget
@@ -31,6 +30,7 @@
 from bika.lims.browser.widgets import DurationWidget
 from bika.lims.config import PROJECTNAME
 from bika.lims.content.bikaschema import BikaSchema
+from bika.lims.browser.widgets.referencewidget import ReferenceWidget as BikaReferenceWidget
 
 
 schema = BikaSchema.copy() + Schema((
@@ -77,7 +77,7 @@
         allowed_types=('SampleType',),
         vocabulary='SampleTypesVocabulary',
         relationship='SamplePointSampleType',
-        widget=ReferenceWidget(
+        widget=BikaReferenceWidget(
             label=_("Sample Types"),
             description=_("The list of sample types that can be collected "
                           "at this sample point.  If no sample types are "

From f8617802a08e8474ce046bf1e61968d92845def6 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Tue, 12 Dec 2017 12:26:59 +0100
Subject: [PATCH 3/3] Render multivalued reference fields in view

---
 .../bika/bika_widgets/referencewidget.pt      | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/bika/lims/skins/bika/bika_widgets/referencewidget.pt b/bika/lims/skins/bika/bika_widgets/referencewidget.pt
index a0b3793a50..c2347942cd 100644
--- a/bika/lims/skins/bika/bika_widgets/referencewidget.pt
+++ b/bika/lims/skins/bika/bika_widgets/referencewidget.pt
@@ -8,20 +8,39 @@
 
     <!-- Reference Widget -->
     <metal:view_macro define-macro="view"
-            tal:define="kssClassesView context/@@kss_field_decorator_view;
-                        getKssClasses nocall:kssClassesView/getKssClassesInlineEditable;">
+                      tal:define="kssClassesView context/@@kss_field_decorator_view;
+                                    getKssClasses nocall:kssClassesView/getKssClassesInlineEditable;">
+
+      <!-- Single Valued Field -->
+      <tal:singlevalued tal:condition="not:field/multiValued">
         <span metal:define-macro="string-field-view"
-            tal:define="kss_class python:getKssClasses(fieldName,
-                        templateId='widgets/string', macro='string-field-view');
-                        uid context/UID|nothing"
-            tal:attributes="class kss_class;
-                            id string:parent-fieldname-$fieldName-$uid">
-            <span metal:define-slot="inside"
-                  tal:define="value accessor;
-                              value python: (value and hasattr(value, 'Title')) and value.Title() or '';"
-                  tal:attributes="value python: value.strip();"
-                  tal:content="value">reference</span>
+              tal:define="kss_class python:getKssClasses(fieldName,
+                                  templateId='widgets/string', macro='string-field-view');
+                                  uid context/UID|nothing"
+              tal:attributes="class kss_class;
+                                  id string:parent-fieldname-$fieldName-$uid">
+          <span metal:define-slot="inside"
+                tal:define="value accessor;
+                            value python: (value and hasattr(value, 'Title')) and value.Title() or '';"
+                tal:attributes="value python: value.strip();"
+                tal:content="value">reference</span>
         </span>
+      </tal:singlevalued>
+
+      <!-- Multi Valued Field -->
+      <tal:multivalued tal:condition="field/multiValued">
+        <ul tal:define="value accessor">
+          <li tal:repeat="obj value">
+            <a href="#"
+               tal:attributes="href obj/absolute_url;
+                     class python:obj.portal_type.replace(' ', '_')"
+               tal:content="python:obj.Title() or obj.absolute_url(relative=1)">
+              Target Title
+            </a>
+          </li>
+        </ul>
+      </tal:multivalued>
+
     </metal:view_macro>
 
     <metal:define define-macro="edit">