Fixed catalogs in page templates (#32)

* Fixed catalogs in page templates * Changelog and version * Version for dot release
senaite · Jan 7, 2022 · a9be86e · a9be86e
1 parent 3804a09
commit a9be86e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,10 +1,10 @@
 Changelog
 =========
 
-2.2.0 (unreleased)
+2.1.1 (unreleased)
 ------------------
 
-- no changes yet
+- #32 Fixed catalogs in page templates
 
 
 2.1.0 (2022-01-05)

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-version = "2.2.0"
+version = "2.1.1"
 
 setup(
     name="senaite.storage",

diff --git a/src/senaite/storage/browser/container/templates/store_container.pt b/src/senaite/storage/browser/container/templates/store_container.pt
@@ -68,15 +68,15 @@
                        class="custom-select blurrable firstToFocus referencewidget"
                        base_query='{"sort_on": "getId", "sort_order": "ascending", "limit": "30"}'
                        search_query='{}'
-                       catalog_name="bika_catalog_analysisrequest_listing"
+                       catalog_name="senaite_catalog_sample"
                        combogrid_options='{"colModel": [
                                               {"columnName": "getId", "align": "left", "label": "Id", "width": "15"},
                                               {"columnName": "getClientSampleID", "align": "left", "label": "CSID", "width": "15"},
                                               {"columnName": "getSampleTypeTitle", "align": "left", "label": "Sample Type", "width": "70"},
                                               {"columnName": "UID", "hidden": true}
                                           ],
                                           "search_fields": ["listing_searchable_text"],
-                                          "catalog_name": "bika_catalog_analysisrequest_listing",
+                                          "catalog_name": "senaite_catalog_sample",
                                           "url": "referencewidget_search",
                                           "discard_empty": [],
                                           "showOn": true,

diff --git a/src/senaite/storage/browser/container/templates/store_samples.pt b/src/senaite/storage/browser/container/templates/store_samples.pt
@@ -95,14 +95,14 @@
                               "limit": "30"
                             }'
                             search_query='{}'
-                            catalog_name="senaite_storage_catalog"
+                            catalog_name="senaite_catalog_storage"
                             combogrid_options='{
                               "colModel": [
                                 {"columnName": "id", "align": "left", "label": "Id", "width": "10"},
                                 {"columnName": "get_full_title", "align": "left", "label": "Container full path", "width": "90"},
                                 {"columnName": "UID", "hidden": true}],
                               "search_fields": ["listing_searchable_text"],
-                              "catalog_name": "senaite_storage_catalog",
+                              "catalog_name": "senaite_catalog_storage",
                               "url": "referencewidget_search",
                               "discard_empty": [],
                               "showOn": true,

diff --git a/src/senaite/storage/upgrade/configure.zcml b/src/senaite/storage/upgrade/configure.zcml
@@ -4,10 +4,10 @@
     i18n_domain="senaite.storage">
 
 <genericsetup:upgradeStep
-        title="Upgrade to SENAITE STORAGE 2.2.0"
+        title="Upgrade to SENAITE STORAGE 2.1.1"
         source="2.1.0"
-        destination="2.2.0"
-        handler="senaite.storage.upgrade.v02_02_000.upgrade"
+        destination="2.1.1"
+        handler="senaite.storage.upgrade.v02_01_100.upgrade"
         profile="senaite.storage:default"/>
 
 <genericsetup:upgradeStep

diff --git a/src/senaite/storage/upgrade/v02_02_000.py → src/senaite/storage/upgrade/v02_01_100.py b/src/senaite/storage/upgrade/v02_02_000.py → src/senaite/storage/upgrade/v02_01_100.py
@@ -23,7 +23,7 @@
 from senaite.storage import PRODUCT_NAME
 from senaite.storage import logger
 
-version = "2.2.0"
+version = "2.1.1"
 
 
 @upgradestep(PRODUCT_NAME, version)