From 39eb2668dfd08662844fadd560e4d7f4ee451646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= <jp@naralabs.com>
Date: Mon, 4 Nov 2019 15:11:55 +0100
Subject: [PATCH 1/3] Support for "hidden" visibility in referencewidget

---
 .../bika/bika_widgets/referencewidget.pt      | 252 ++++++++++--------
 1 file changed, 136 insertions(+), 116 deletions(-)

diff --git a/bika/lims/skins/bika/bika_widgets/referencewidget.pt b/bika/lims/skins/bika/bika_widgets/referencewidget.pt
index a03713f42a..cb26a20621 100644
--- a/bika/lims/skins/bika/bika_widgets/referencewidget.pt
+++ b/bika/lims/skins/bika/bika_widgets/referencewidget.pt
@@ -45,122 +45,142 @@
 
     </metal:view_macro>
 
-    <metal:define define-macro="edit">
-      <metal:use use-macro="field_macro | context/widgets/field/macros/edit">
-        <metal:fill metal:fill-slot="widget_body">
-
-          <div class="multiValued-listing"
-                tal:condition="python:context.Schema()[fieldName].multiValued"
-                tal:attributes="id string:${fieldName}-listing;fieldName fieldName;"
-                tal:define="values python:context.Schema()[fieldName].getAccessor(context)();">
-                <tal:repeat repeat="value values">
-                  <div class="reference_multi_item"
-                       tal:attributes="uid value/UID">
-                    <img
-                      class="deletebtn"
-                      tal:attributes="
-                        src string:${portal/absolute_url}/++resource++bika.lims.images/delete.png;
-                        fieldName fieldName;
-                        uid value/UID"/>
-                    <span tal:replace="python:str(value.Title())"/>
-                  </div>
-                </tal:repeat>
-          </div>
-
-          <tal:input_field define="val python:context.Schema()[fieldName].getAccessor(context)();
-                                   text_default val/Title|nothing;
-                                   text_attr widget/ui_item|nothing;
-                                   text python:text_attr and getattr(val, text_attr, text_default) or text_default;">
-          <input
-                 type="text"
-                 class="blurrable firstToFocus referencewidget"
-                 tal:condition="python:context.Schema()[fieldName].required"
-                 tal:attributes="name fieldName;
-                                 required python:True;
-                                 id fieldName;
-                                 value text;
-                                 uid val/UID|nothing;
-                                 size widget/size;
-                                 placeholder widget/placeholder|nothing;
-                                 maxlength widget/maxlength;
-                                 catalog_name widget/catalog_name;
-                                 base_query python:widget.get_base_query(context, fieldName);
-                                 search_query string:{};
-                                 showOn widget/showOn;
-                                 searchIcon widget/searchIcon;
-                                 resetButton widget/resetButton;
-                                 minLength python:widget.minLength;
-                                 ui_item widget/ui_item;
-                                 multiValued python:1 if context.Schema()[fieldName].multiValued else 0;
-                                 combogrid_options python:widget.get_combogrid_options(context, fieldName)"
-                 />
-          <input
-                 type="text"
-                 class="blurrable firstToFocus referencewidget"
-                 tal:condition="python:not context.Schema()[fieldName].required"
-                 tal:attributes="name fieldName;
-                                 id fieldName;
-                                 value text;
-                                 uid val/UID|nothing;
-                                 size widget/size;
-                                 placeholder widget/placeholder|nothing;
-                                 maxlength widget/maxlength;
-                                 catalog_name widget/catalog_name;
-                                 base_query python:widget.get_base_query(context, fieldName);
-                                 search_query string:{};
-                                 showOn widget/showOn;
-                                 searchIcon widget/searchIcon;
-                                 resetButton widget/resetButton;
-                                 minLength widget/minLength;
-                                 ui_item widget/ui_item;
-                                 multiValued python:1 if context.Schema()[fieldName].multiValued else 0;
-                                 combogrid_options python:widget.get_combogrid_options(context, fieldName)"
-                 />
-            <!-- AddButton definition -->
-            <a rel='#overlay'
-               class='add-button referencewidget-add-button'
-               tal:define="options python:widget.get_addbutton_options()"
-               tal:condition="options/visible"
-               tal:attributes="name python:fieldName+'_addbutton';
-                               id   python:fieldName+'_addbutton';
-                               href string:${portal/absolute_url}/${options/url};
-                               data_fieldid fieldName;
-                               data_fieldname fieldName;
-                               data_overlay_handler options/overlay_handler;
-                               data_returnfields options/return_fields;
-                               data_jscontrollers options/js_controllers;
-                               data_overlay options/overlay_options">
-                    <span class='notext' i18n:translate="">Add</span>
-            </a>
-            <!-- EditButton definition -->
-            <a rel='#overlay'
-               class='edit-button referencewidget-edit-button'
-               tal:define="options python:widget.get_editbutton_options()"
-               tal:condition="options/visible"
-               tal:attributes="name python:fieldName+'_editbutton';
-                               id   python:fieldName+'_editbutton';
-                               href string:${portal/absolute_url}/${options/url};
-                               data_baseurl string:${portal/absolute_url}/${options/url};
-                               data_fieldid fieldName;
-                               data_fieldname fieldName;
-                               data_overlay_handler options/overlay_handler;
-                               data_returnfields options/return_fields;
-                               data_jscontrollers options/js_controllers;
-                               data_overlay options/overlay_options">
-                    <span class='notext' i18n:translate="">Edit</span>
-            </a>
-          <input
-                 type="hidden"
-                 name=""
-                 value=""
-                 tal:define="val python:context.Schema()[fieldName].getAccessor(context)();"
-                 tal:attributes="name string:${fieldName}_uid;
-                                 id string:${fieldName}_uid;
-                                 value python:widget.initial_uid_field_value(val);"/>
-          </tal:input_field>
-        </metal:fill>
-      </metal:use>
-    </metal:define>
+    <metal:edit_macro define-macro="edit"
+      tal:define="visibility_mode python: widget.isVisible(context, mode='edit', field=field);">
+
+      <tal:edit_visible tal:condition="python: visibility_mode == 'visible'">
+        <metal:use use-macro="field_macro | context/widgets/field/macros/edit">
+          <metal:fill metal:fill-slot="widget_body">
+            <div class="multiValued-listing"
+                 tal:condition="python:context.Schema()[fieldName].multiValued"
+                 tal:attributes="id string:${fieldName}-listing;fieldName fieldName;"
+                 tal:define="values python:context.Schema()[fieldName].getAccessor(context)();">
+              <tal:repeat repeat="value values">
+                <div class="reference_multi_item"
+                     tal:attributes="uid value/UID">
+                  <img
+                    class="deletebtn"
+                    tal:attributes="
+                      src string:${portal/absolute_url}/++resource++bika.lims.images/delete.png;
+                      fieldName fieldName;
+                      uid value/UID"/>
+                  <span tal:replace="python:str(value.Title())"/>
+                </div>
+              </tal:repeat>
+            </div>
+
+            <tal:input_field define="val python:context.Schema()[fieldName].getAccessor(context)();
+                                     text_default val/Title|nothing;
+                                     text_attr widget/ui_item|nothing;
+                                     text python:text_attr and getattr(val, text_attr, text_default) or text_default;">
+              <input type="text"
+                     class="blurrable firstToFocus referencewidget"
+                     tal:condition="python:context.Schema()[fieldName].required"
+                     tal:attributes="name fieldName;
+                                     required python:True;
+                                     id fieldName;
+                                     value text;
+                                     uid val/UID|nothing;
+                                     size widget/size;
+                                     placeholder widget/placeholder|nothing;
+                                     maxlength widget/maxlength;
+                                     catalog_name widget/catalog_name;
+                                     base_query python:widget.get_base_query(context, fieldName);
+                                     search_query string:{};
+                                     showOn widget/showOn;
+                                     searchIcon widget/searchIcon;
+                                     resetButton widget/resetButton;
+                                     minLength python:widget.minLength;
+                                     ui_item widget/ui_item;
+                                     multiValued python:1 if context.Schema()[fieldName].multiValued else 0;
+                                     combogrid_options python:widget.get_combogrid_options(context, fieldName)" />
+
+              <input type="text"
+                     class="blurrable firstToFocus referencewidget"
+                     tal:condition="python:not context.Schema()[fieldName].required"
+                     tal:attributes="name fieldName;
+                                     id fieldName;
+                                     value text;
+                                     uid val/UID|nothing;
+                                     size widget/size;
+                                     placeholder widget/placeholder|nothing;
+                                     maxlength widget/maxlength;
+                                     catalog_name widget/catalog_name;
+                                     base_query python:widget.get_base_query(context, fieldName);
+                                     search_query string:{};
+                                     showOn widget/showOn;
+                                     searchIcon widget/searchIcon;
+                                     resetButton widget/resetButton;
+                                     minLength widget/minLength;
+                                     ui_item widget/ui_item;
+                                     multiValued python:1 if context.Schema()[fieldName].multiValued else 0;
+                                     combogrid_options python:widget.get_combogrid_options(context, fieldName)" />
+
+                <!-- AddButton definition -->
+                <a rel='#overlay'
+                   class='add-button referencewidget-add-button'
+                   tal:define="options python:widget.get_addbutton_options()"
+                   tal:condition="options/visible"
+                   tal:attributes="name python:fieldName+'_addbutton';
+                                   id   python:fieldName+'_addbutton';
+                                   href string:${portal/absolute_url}/${options/url};
+                                   data_fieldid fieldName;
+                                   data_fieldname fieldName;
+                                   data_overlay_handler options/overlay_handler;
+                                   data_returnfields options/return_fields;
+                                   data_jscontrollers options/js_controllers;
+                                   data_overlay options/overlay_options">
+                        <span class='notext' i18n:translate="">Add</span>
+                </a>
+
+                <!-- EditButton definition -->
+                <a rel='#overlay'
+                   class='edit-button referencewidget-edit-button'
+                   tal:define="options python:widget.get_editbutton_options()"
+                   tal:condition="options/visible"
+                   tal:attributes="name python:fieldName+'_editbutton';
+                                   id   python:fieldName+'_editbutton';
+                                   href string:${portal/absolute_url}/${options/url};
+                                   data_baseurl string:${portal/absolute_url}/${options/url};
+                                   data_fieldid fieldName;
+                                   data_fieldname fieldName;
+                                   data_overlay_handler options/overlay_handler;
+                                   data_returnfields options/return_fields;
+                                   data_jscontrollers options/js_controllers;
+                                   data_overlay options/overlay_options">
+                   <span class='notext' i18n:translate="">Edit</span>
+                </a>
+
+                <input type="hidden"
+                       name=""
+                       value=""
+                       tal:define="val python:context.Schema()[fieldName].getAccessor(context)();"
+                       tal:attributes="name string:${fieldName}_uid;
+                                       id string:${fieldName}_uid;
+                                       value python:widget.initial_uid_field_value(val);"/>
+              </tal:input_field>
+
+          </metal:fill>
+        </metal:use>
+      </tal:edit_visible>
+
+      <tal:edit_hidden tal:condition="python: visibility_mode == 'hidden'"
+        define="val python:context.Schema()[fieldName].getAccessor(context)();
+                text_default val/Title|nothing;
+                text_attr widget/ui_item|nothing;
+                text python:text_attr and getattr(val, text_attr, text_default) or text_default;">
+
+        <input type="hidden"
+               tal:attributes="name fieldName;
+                               id fieldName;
+                               value text;
+                               uid val/UID|nothing;" />
+        <input type="hidden"
+               tal:attributes="name string:${fieldName}_uid;
+                               id string:${fieldName}_uid;
+                               value python:widget.initial_uid_field_value(val);"/>
+      </tal:edit_hidden>
+    </metal:edit_macro>
 
     <div metal:define-macro="search">
       <div metal:use-macro="context/widgets/string/macros/edit">

From 74d121dda3e0157b7fc7db2cda0867bf4e1c18e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= <jp@naralabs.com>
Date: Mon, 4 Nov 2019 15:22:35 +0100
Subject: [PATCH 2/3] Support for "readonly" visibility in referencewidget

---
 .../bika/bika_widgets/referencewidget.pt      | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/bika/lims/skins/bika/bika_widgets/referencewidget.pt b/bika/lims/skins/bika/bika_widgets/referencewidget.pt
index cb26a20621..2635b18966 100644
--- a/bika/lims/skins/bika/bika_widgets/referencewidget.pt
+++ b/bika/lims/skins/bika/bika_widgets/referencewidget.pt
@@ -164,12 +164,34 @@
         </metal:use>
       </tal:edit_visible>
 
-      <tal:edit_hidden tal:condition="python: visibility_mode == 'hidden'"
+      <tal:edit_hidden tal:condition="python: visibility_mode in ['hidden', 'readonly']"
         define="val python:context.Schema()[fieldName].getAccessor(context)();
                 text_default val/Title|nothing;
                 text_attr widget/ui_item|nothing;
                 text python:text_attr and getattr(val, text_attr, text_default) or text_default;">
 
+        <tal:readonly tal:condition="python: visibility_mode == 'readonly'">
+          <div class="field form-group">
+            <label class="formQuestion">
+                <span tal:replace="python:widget.Label(here)"
+                      i18n:translate="" />
+                <span class="required"
+                      tal:condition="field/required"
+                      title="Required"
+                      i18n:attributes="title title_required;">&nbsp;</span>
+                <span class="formHelp"
+                     tal:define="description python:widget.Description(here)"
+                     tal:content="structure description"
+                     tal:attributes="id string:${fieldName}_help"
+                     i18n:translate="">
+                </span>
+            </label>
+            <div>
+              <span tal:content="text"/>
+            </div>
+          </div>
+        </tal:readonly>
+
         <input type="hidden"
                tal:attributes="name fieldName;
                                id fieldName;

From 67bb6bb9d65890f02e4a624984219091dea0e113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= <jp@naralabs.com>
Date: Mon, 4 Nov 2019 16:03:37 +0100
Subject: [PATCH 3/3] Support for "readonly" visibility mode

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9a05a8cf73..effc14cd62 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,8 @@ Changelog
 
 **Added**
 
+- #1466 Support for "readonly" and "hidden" visibility modes in ReferenceWidget
+
 
 **Changed**