diff --git a/CHANGES.md b/CHANGES.md index 40eac40fc..d95a430a4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +2.21.4-ux / 2019-10-03 +====================== + +**Bug fixes** + +* Fix services not displayed properly + 2.21.3-ux / 2019-09-25 ====================== diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 4c401f2f2..4d3420666 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "geotrekrando", - "version": "2.21.3-ux", + "version": "2.21.4-ux", "dependencies": { "@gulp-sourcemaps/identity-map": { "version": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz", diff --git a/package.json b/package.json index d8630ab66..858bcb618 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "geotrekrando", - "version": "2.21.3-ux", + "version": "2.21.4-ux", "description": "Geotrek rando public portal of Geotrek", "author": "Makina Corpus", "main": "src/app/app.js", diff --git a/src/app/detail/templates/detail-sensitives.html b/src/app/detail/templates/detail-sensitives.html index fa15a3233..26827b2fe 100644 --- a/src/app/detail/templates/detail-sensitives.html +++ b/src/app/detail/templates/detail-sensitives.html @@ -15,12 +15,10 @@

{{'SENSITIVE_ZONE' | translate}}

{{month}} -

- {{'CONTACT' | translate}} : {{sensitive.contact}} -

-

- {{sensitive.description}} +

{{'CONTACT' | translate}} : +

+

{{'SHOW_MORE' | translate}}

diff --git a/src/app/services/services.js b/src/app/services/services.js index 054f6c89a..367b0aa70 100644 --- a/src/app/services/services.js +++ b/src/app/services/services.js @@ -54,10 +54,10 @@ function servicesService($resource, $q, globalSettings, settingsFactory, transla var deferred = $q.defer(); var currentLang = translationService.getCurrentLang(); if (element.properties.contentType === 'trek') { - var url = settingsFactory.trekUrl.replace(/\$lang/, currentLang) + element.id + '/' + globalSettings.POI_FILE; + var url = settingsFactory.trekUrl.replace(/\$lang/, currentLang) + element.id + '/' + globalSettings.SERVICES_FILE; } if (element.properties.contentType === 'dive') { - var url = settingsFactory.diveUrl.replace(/\$lang/, currentLang) + element.id + '/' + globalSettings.POI_FILE; + var url = settingsFactory.diveUrl.replace(/\$lang/, currentLang) + element.id + '/' + globalSettings.SERVICES_FILE; } var requests = $resource(url, {}, { query: {