Merge tag '2.21.5' into geotrek_UX_dev_mid_2018

GeotrekCE · Nov 13, 2019 · 3e8497e · 3e8497e
2 parents 38dbab3 + 435775e
commit 3e8497e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+2.21.5-ux / 2019-11-13
+======================
+
+**Bug fixes**
+
+* Fix duration showed on touristic contents
+
 2.21.4-ux / 2019-10-03
 ======================
 

diff --git a/docs/settings-custom-json-all-options.md b/docs/settings-custom-json-all-options.md
@@ -85,7 +85,7 @@ ENABLE_TOURISTIC_CONTENT | Boolean | `true` | Enable touristic contents service
 ENABLE_TOURISTIC_EVENTS | Boolean | `true` | Enable touristic events service and fetching from the API
 ENABLE_DIVES | Boolean | `false` | Enable dives service and fetching from the API
 DEFAULT_ACTIVE_CATEGORY | String (category id) | `"T"` | The default active category.
-LIST_EXCLUDE_CATEGORIES | Array of strings (categories id) | |  `[]` | List of categories excluded from the filters on results page.
+LIST_EXCLUDE_CATEGORIES | Array of strings (categories id) | `[]` | List of categories excluded from the filters on results page.
 ENABLE_UNIQUE_CAT | Boolean | `true` | ~~If true, only one category can be activated at the same time in the result page filters.~~<br>**Inactive option**: Current user interface does not make it possible to have multiple categories selected at the same time anymore. This option is now enforced to `true`.
 DEFAULT_INTEREST | String | `"pois"` | Choose which interest to open by default on detail page. Possible values: `"pois"`, `"near"`, `"children"`, `"parents"`, `""`.
 

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.21.4-ux",
+  "version": "2.21.5-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
@@ -229,10 +229,6 @@ function categoriesService(globalSettings, $q, treksService, contentsService, ev
                             type: 'checkbox',
                             values: aContent.properties.type2 ? angular.copy(aContent.properties.type2) : []
                         },
-                        duration: {
-                            type: 'range',
-                            values: globalSettings.DURATION_FILTER ? globalSettings.DURATION_FILTER : []
-                        },
                         themes: {
                             type: 'checkbox',
                             values: aContent.properties.themes ? angular.copy(aContent.properties.themes) : []