Merge tag '2.29.1' into geotrek_UX_dev_mid_2018

GeotrekCE · Oct 20, 2020 · f84a3fd · f84a3fd
2 parents 163c373 + be0b8e7
commit f84a3fd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,10 +1,19 @@
+2.29.1-ux / 2020-10-20
+===================
+
+**Bug fixes**
+
+* Fix no pictogram trek's label should keep old icon
+
+
 2.29.0-ux / 2020-10-20
 ======================
 
 **Enhancements**
 
-* Add trek's label categories filtering
+* Add trek's label categories filtering (is park centered)
 * Use trek's label warning
+**Warning:** these features are only available for Geotrek-admin >= 2.38.5
 
 
 2.28.2-ux / 2020-10-16

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "geotrekrando",
-  "version": "2.29.0-ux",
+  "version": "2.29.1-ux",
   "description": "Geotrek rando public portal of Geotrek",
   "author": "Makina Corpus",
   "main": "src/app/app.js",

diff --git a/src/app/categories/services.js b/src/app/categories/services.js
@@ -76,7 +76,7 @@ function categoriesService(globalSettings, $q, treksService, contentsService, ev
                         labels: {
                             type: 'checkbox',
                             values: aTrek.properties.labels ? angular.copy(aTrek.properties.labels) : []
-                        },
+                        }
                     };
 
                     currentCategory.duration.values = _.map(_.sortBy(currentCategory.duration.values, 'id'));

diff --git a/src/app/detail/templates/detail-content.html b/src/app/detail/templates/detail-content.html
@@ -81,8 +81,8 @@ <h3>
     <div ng-repeat="label in result.properties.labels"
          class="detail-content-notice labels" ng-if="label">
         <span class="notice-symbol">
-            <ng-include ng-if="label.pictogram | isSVG" src="label.pictogram"></ng-include>
-            <img ng-if="!(label.pictogram | isSVG)" ng-src="{{label.pictogram}}" ng-alt="{{label.name}}">
+            <ng-include ng-if="label.pictogram && label.pictogram | isSVG" src="label.pictogram"></ng-include>
+            <img ng-if="label.pictogram && !(label.pictogram | isSVG)" ng-src="{{label.pictogram}}" ng-alt="{{label.name}}">
             <i ng-if="!label.pictogram" class="notice-symbol fa fa-info-circle"></i>
         </span>
 

diff --git a/tests/dataset/api/es/treks.geojson b/tests/dataset/api/es/treks.geojson
@@ -1916,4 +1916,4 @@
             }
         }
     ]
-}
+}
diff --git a/tests/dataset/api/fr/treks.geojson b/tests/dataset/api/fr/treks.geojson
@@ -3422,4 +3422,4 @@
             }
         }
     ]
-}
+}