updated field finanziamenti

RegioneER · Nov 7, 2024 · add32f6 · add32f6
1 parent c829c2a
commit add32f6
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 16 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -4,7 +4,8 @@ Changelog
 4.2.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Refactoring for field finanziamenti #28788
+  [daniele]
 
 
 4.2.0 (2022-01-26)

diff --git a/rer/bandi/browser/bando-right.pt b/rer/bandi/browser/bando-right.pt
@@ -137,8 +137,8 @@
                         </div>
                         <div class="finanziatori-bando" tal:define="finanziato context/finanziato"
                             tal:condition="finanziato">
-                            <strong><span i18n:translate="finanziatori_label">Financed by EU programmes</span>:</strong>
-                            <span tal:content="python:' | '.join(finanziato)"></span>
+                            <strong><span i18n:translate="finanziatori_label">Financed by EU programmes</span></strong>
+                            <!--span tal:content="python:' | '.join(finanziato)"></span-->
                         </div>
                     </div>
                     <div class="visualClear"></div>

diff --git a/rer/bandi/browser/bando.pt b/rer/bandi/browser/bando.pt
@@ -115,8 +115,8 @@
               </div>
               <div class="finanziatori-bando" tal:define="finanziato context/finanziato"
                   tal:condition="finanziato">
-                <strong><span i18n:translate="finanziatori_label">Financed by EU programmes</span>:</strong>
-                <span tal:content="python:' | '.join(finanziato)"></span>
+                <strong><span i18n:translate="finanziatori_label">Financed by EU programmes</span></strong>
+                <!--span tal:content="finanziato"></span-->
               </div>
             </div>
             <div class="visualClear"></div>

diff --git a/rer/bandi/profiles/default/catalog.xml b/rer/bandi/profiles/default/catalog.xml
@@ -13,7 +13,7 @@
  <index name="tipologia_bando" meta_type="FieldIndex">
   <indexed_attr value="tipologia_bando"/>
  </index>
- <index name="finanziato" meta_type="KeywordIndex">
+ <index name="finanziato" meta_type="BooleanIndex">
   <indexed_attr value="finanziato"/>
  </index>
  <index name="materie" meta_type="KeywordIndex">

diff --git a/rer/bandi/profiles/migrate_to_3200/catalog.xml b/rer/bandi/profiles/migrate_to_3200/catalog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <object name="portal_catalog" meta_type="Plone Catalog Tool">
 
- <index name="fiinanziatori" remove="True" />
+ <index name="finanziatori" remove="True" />
 </object>
diff --git a/rer/bandi/upgrades.py b/rer/bandi/upgrades.py
@@ -242,9 +242,6 @@ def migrate_to_3200(context):
             )
         )
         bando = brain.getObject()
-        import pdb
-
-        pdb.set_trace()
         if getattr(bando, "finanziatori", []):
             setattr(bando, "finanziato", True)
             keywords = [k for k in getattr(bando, "finanziatori", []) if k]
@@ -269,16 +266,27 @@ def migrate_to_3200(context):
     logger.info("### Fixing {tot} Collections ###".format(tot=tot_results))
     for counter, brain in enumerate(collections):
         collection = brain.getObject()
+
+        crit_list = collection.query
+        filtered_crit = [x for x in crit_list if x['i'] == "finanziatori"]
+        if not filtered_crit:
+            continue
+
         query = []
         for criteria in getattr(collection, "query", []):
+            if criteria["i"] == "finanziatori":
+                criteria["o"] = 'plone.app.querystring.operation.boolean.isTrue'
+                criteria["v"] = ""
             criteria["i"] = criteria_mapping.get(criteria["i"], criteria["i"])
-            query.append(criteria)
+
+            if criteria not in query:
+                query.append(criteria)
         collection.query = query
 
         # fix sort_on
-        sort_on = getattr(collection, "sort_on", "")
-        if sort_on in criteria_mapping:
-            collection.sort_on = criteria_mapping[sort_on]
+        #sort_on = getattr(collection, "sort_on", "")
+        #if sort_on in criteria_mapping:
+        #    collection.sort_on = criteria_mapping[sort_on]
 
         logger.info(
             "[{counter}/{tot}] - {collection}".format(
@@ -287,4 +295,4 @@ def migrate_to_3200(context):
                 collection=brain.getPath(),
             )
         )
-    logger.info("Upgrade to 3100 complete")
+    logger.info("Upgrade to 3200 complete")
diff --git a/rer/bandi/vocabularies/vocabularies.py b/rer/bandi/vocabularies/vocabularies.py
@@ -52,7 +52,7 @@ class BandiBaseVocabularyFactory(object):
     @property
     def terms(self):
         return [
-            SimpleTerm(value=x, token=x.encode("utf-8"), title=x)
+            SimpleTerm(value=x, token=x.decode("utf-8"), title=x)
             for x in self.vocab_name
         ]