manager: fix agenda duplication & desk labels (#45381)

chrono/agendas/models.py

@@ -1045,11 +1045,12 @@ class Desk(models.Model):
         new_desk = copy.deepcopy(self)
         new_desk.pk = None
         # set label
-        new_desk.label = label or _('Copy of %s') % self.label
+        new_desk.label = label or new_desk.label
+        # reset slug
+        new_desk.slug = None
+        # set agenda
         if agenda_target:
             new_desk.agenda = agenda_target
-        else:
-            new_desk.slug = None
         # store new desk
         new_desk.save()
 

tests/test_agendas.py

@@ -849,10 +849,10 @@ def test_desk_duplicate():
         end_datetime=now() + datetime.timedelta(days=2),
     )
 
-    new_desk = desk.duplicate()
+    new_desk = desk.duplicate(label="New Desk")
     assert new_desk.pk != desk.pk
-    assert new_desk.label == 'Copy of Desk'
-    assert new_desk.slug == 'copy-of-desk'
+    assert new_desk.label == 'New Desk'
+    assert new_desk.slug == 'new-desk'
     assert new_desk.timeperiod_set.count() == 1
     new_time_period = TimePeriod.objects.get(desk=new_desk)
     assert new_time_period.weekday == time_period.weekday
@@ -871,8 +871,8 @@ def test_desk_duplicate():
     assert new_source2.ics_file.path != source2.ics_file.path
 
     # duplicate again !
-    new_desk = desk.duplicate()
-    assert new_desk.slug == 'copy-of-desk-1'
+    new_desk = desk.duplicate(label="New Desk")
+    assert new_desk.slug == 'new-desk-1'
 
 
 def test_agenda_meetings_duplicate():
@@ -915,6 +915,7 @@ def test_agenda_meetings_duplicate():
 
     new_desk = new_agenda.desk_set.first()
     assert new_desk.pk != desk.pk
+    assert new_desk.label == desk.label
     assert new_desk.slug == desk.slug
     assert new_desk.timeperiod_set.count() == 1
     new_time_period = TimePeriod.objects.get(desk=new_desk)