Merge 2.21.4

GeotrekCE · Oct 3, 2019 · 6e4a0f3 · 6e4a0f3
2 parents bb63764 + 543218e
commit 6e4a0f3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git 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
diff --git 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
@@ -15,12 +15,10 @@ <h3>{{'SENSITIVE_ZONE' | translate}}</h3>
               {{month}}
             </span>
           </div>
-          <p ng-if="sensitive.contact" class="contact">
-            {{'CONTACT' | translate}} : {{sensitive.contact}}
-          </p>
-          <p ng-if="sensitive.description">
-            {{sensitive.description}}
+          <p class="contact" ng-if="sensitive.contact">{{'CONTACT' | translate}} :
+            <span class="contact" ng-if="sensitive.contact" ng-bind-html="sensitive.contact | sanitizeData: true"></span>
           </p>
+          <p ng-if="sensitive.description" ng-bind-html="sensitive.description | sanitizeData: true"></p>
           <p ng-if="sensitive.species_url">
             <a href="{{sensitive.species_url}}" target="_blank">{{'SHOW_MORE' | translate}}</a>
           </p>

diff --git 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: {