[Fixes GeoNode#8690] merge with 3.3.x

mattiagiupponi · Feb 3, 2022 · 14abc5b · 14abc5b
2 parents b089bf2 + b24c8e8
commit 14abc5b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/geonode/base/forms.py b/geonode/base/forms.py
@@ -568,6 +568,8 @@ class Meta:
             'users_geolimits',
             'groups_geolimits',
             'dirty_state'
+            'was_approved',
+            'was_published'
         )
 
 

diff --git a/geonode/geoapps/templates/apps/app_detail.html b/geonode/geoapps/templates/apps/app_detail.html
@@ -1,5 +1,6 @@
 {% extends "apps/app_base.html" %}
 {% load i18n %}
+{% load l10n %}
 {% load staticfiles %}
 {% load dialogos_tags %}
 {% load pinax_ratings_tags %}
@@ -75,7 +76,7 @@ <h3>{% trans "Rate this" %} {{ resource.type }}</h3>
           <h3>{% trans 'Average Rating' %}</h3>
           {% overall_rating resource "geoapp" as geoapp_rating %}
           {% num_ratings resource as num_votes %}
-          <div class="overall_rating" style="float:left" data-score="{{ geoapp_rating }}"></div> ({{num_votes}})
+          <div class="overall_rating" style="float:left" data-score="{{ geoapp_rating|unlocalize }}"></div> ({{num_votes}})
         </article>
         {% endif %}
 

diff --git a/geonode/layers/templates/layers/layer_detail.html b/geonode/layers/templates/layers/layer_detail.html
@@ -1,5 +1,6 @@
 {% extends "layers/layer_base.html" %}
 {% load i18n %}
+{% load l10n %}
 {% load staticfiles %}
 {% load dialogos_tags %}
 {% load pinax_ratings_tags %}
@@ -249,7 +250,7 @@ <h4>{% trans "Rate this layer" %}</h4>
         <h4>{% trans 'Average Rating' %}</h4>
         {% overall_rating resource "layer" as layer_rating %}
         {% num_ratings resource as num_votes %}
-        <div class="overall_rating" data-score="{{ layer_rating }}"></div> ({{num_votes}})
+        <div class="overall_rating" data-score="{{ layer_rating|unlocalize }}"></div> ({{num_votes}})
       </article>
       {% endif %}
 

diff --git a/geonode/maps/templates/maps/map_detail.html b/geonode/maps/templates/maps/map_detail.html
@@ -1,5 +1,6 @@
 {% extends "maps/map_base.html" %}
 {% load i18n %}
+{% load l10n %}
 {% load staticfiles %}
 {% load dialogos_tags %}
 {% load pinax_ratings_tags %}
@@ -80,7 +81,7 @@ <h3>{% trans "Rate this Map" %}</h3>
           <h3>{% trans 'Average Rating' %}</h3>
           {% overall_rating resource "map" as map_rating %}
           {% num_ratings resource as num_votes %}
-          <div class="overall_rating" style="float:left" data-score="{{ map_rating }}"></div> ({{num_votes}})
+          <div class="overall_rating" style="float:left" data-score="{{ map_rating|unlocalize }}"></div> ({{num_votes}})
         </article>
         {% endif %}