Merge branch 'master' into feat/add_circulation_model

GeotrekCE · Oct 18, 2023 · 692cc4f · 692cc4f
2 parents 3a3c929 + ab3a395
commit 692cc4f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.101.1+dev
+2.101.2+dev
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
-geotrek-admin (2.101.1+dev) UNRELEASED; urgency=medium
+geotrek-admin (2.101.2+dev) UNRELEASED; urgency=medium
 
   * 
 
- -- Joaquim Nallar <[email protected]>  Fri, 06 Oct 2023 14:47:47 +0200
+ -- Célia Prat <[email protected]>  Tue, 17 Oct 2023 17:15:50 +0200
+
+geotrek-admin (2.101.2) RELEASED; urgency=medium
+
+  * New package release 
+
+ -- Célia Prat <[email protected]>  Tue, 17 Oct 2023 17:12:13 +0200
 
 geotrek-admin (2.101.1) RELEASED; urgency=medium
 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -3,13 +3,22 @@ CHANGELOG
 =========
 
 
-2.101.1+dev (XXXX-XX-XX)
+2.101.2+dev (XXXX-XX-XX)
 ------------------------
 
 **New features**
 
 - Land: Add ``CirculationEdge`` model to manage circulation types and authorization types in the land module (#3578)
 
+2.101.2 (2023-10-17)
+------------------------
+
+**Bug fixes**
+
+- Fix Aggregator fails when updating Tour steps order (#3793)
+- Fix services list display error (refs ##3795)
+
+
 2.101.1 (2023-10-06)
 ------------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -51,7 +51,7 @@
 # The short X.Y version.
 version = '2.101'
 # The full version, including alpha/beta/rc tags.
-release = '2.101.1+dev'
+release = '2.101.2+dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/geotrek/trekking/models.py b/geotrek/trekking/models.py
@@ -911,8 +911,6 @@ def name_display(self):
                                                              self.name)
         if self.type.published:
             s = '<span class="badge badge-success" title="%s">&#x2606;</span> ' % _("Published") + s
-        elif self.type.review:
-            s = '<span class="badge badge-warning" title="%s">&#x2606;</span> ' % _("Waiting for publication") + s
         return s
 
     @classproperty

diff --git a/geotrek/trekking/parsers.py b/geotrek/trekking/parsers.py
@@ -211,9 +211,9 @@ def end(self):
                         except Trek.DoesNotExist:
                             self.add_warning(_(f"One trek has not be generated for {trek_parent_instance[0].name} : could not find trek with UUID {child}"))
                             continue
-                        OrderedTrekChild.objects.get_or_create(parent=trek_parent_instance[0],
-                                                               child=trek_child_instance,
-                                                               order=order)
+                        OrderedTrekChild.objects.update_or_create(parent=trek_parent_instance[0],
+                                                                  child=trek_child_instance,
+                                                                  defaults={'order': order})
                         order += 1
         except Exception as e:
             self.add_warning(_(f"An error occured in children generation : {getattr(e, 'message', repr(e))}"))