Merge pull request #221 from eea/develop

Make Alphabetic Widget countable again
eea · Jul 19, 2021 · d7570f0 · d7570f0
2 parents c8b309a + a5e37aa
commit d7570f0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -234,7 +234,7 @@ pipeline {
             withSonarQubeEnv('Sonarqube') {
                 sh '''sed -i "s|/plone/instance/src/$GIT_NAME|$(pwd)|g" coverage.xml'''
                 sh '''find xunit-functional -type f -exec mv {} xunit-reports/ ";"'''
-                sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPath=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+                sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
                 sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
             }
           }

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+14.6 - (2021-07-19)
+---------------------------
+* Change: Make Alphabetic Widget countable again
+  [avoinea]
+
 14.5 - (2021-03-20)
 ---------------------------
 * Bug fix: Fix deprecated import (Zope5)

diff --git a/eea/facetednavigation/version.txt b/eea/facetednavigation/version.txt
@@ -1 +1 @@
-14.5
+14.6
diff --git a/eea/facetednavigation/widgets/alphabetic/interfaces.py b/eea/facetednavigation/widgets/alphabetic/interfaces.py
@@ -3,6 +3,7 @@
 from zope import schema
 from z3c.form import field
 from eea.facetednavigation.interfaces import IWidget
+from eea.facetednavigation.widgets.interfaces import CountableSchemata
 from eea.facetednavigation.widgets.interfaces import ISchema
 from eea.facetednavigation.widgets.interfaces import DefaultSchemata as DS
 from eea.facetednavigation.widgets.interfaces import LayoutSchemata
@@ -41,5 +42,6 @@ class DefaultSchemata(DS):
 __all__ = [
     IAlphabeticSchema.__name__,
     DefaultSchemata.__name__,
+    CountableSchemata.__name__,
     LayoutSchemata.__name__,
 ]
diff --git a/eea/facetednavigation/widgets/alphabetic/widget.py b/eea/facetednavigation/widgets/alphabetic/widget.py
@@ -6,6 +6,7 @@
 from eea.facetednavigation.widgets import ViewPageTemplateFile
 from eea.facetednavigation.widgets.widget import CountableWidget
 from eea.facetednavigation.widgets.alphabetic.interfaces import DefaultSchemata
+from eea.facetednavigation.widgets.alphabetic.interfaces import CountableSchemata
 from eea.facetednavigation.widgets.alphabetic.interfaces import LayoutSchemata
 from eea.facetednavigation import EEAMessageFactory as _
 from eea.facetednavigation.widgets.alphabetic.alphabets import (
@@ -25,7 +26,7 @@ class Widget(CountableWidget):
     widget_type = 'alphabetic'
     widget_label = _('Alphabetic')
 
-    groups = (DefaultSchemata, LayoutSchemata)
+    groups = (DefaultSchemata, LayoutSchemata, CountableSchemata)
     index = ViewPageTemplateFile('widget.pt')
 
     # Widget custom API