Fix: do not replace petition text with template one when creating from template

The template text should be use as initial message in the petition creation
Wizard.
But when saving the petition, what the use has input in the Wizard should not
be overwritten with the template text.

Author: fallen

pytition/petition/models.py

@@ -235,10 +235,12 @@ def transfer_to(self, user=None, org=None):
             self.user = None
         self.save()
 
-    def prepopulate_from_template(self, template, fields=None):
+    def prepopulate_from_template(self, template, fields=None, exclude_fields=None):
         if fields is None:
             fields = [f.name for f in self._meta.fields if f.name not in ["id", "title", "salt", "user", "org"]]
         for field in fields:
+            if field in exclude_fields:
+                continue
             if hasattr(self, field) and hasattr(template, field):
                 template_value = getattr(template, field)
                 if template_value is not None and template_value != "":

pytition/petition/views.py

@@ -1067,7 +1067,7 @@ def done(self, form_list, **kwargs):
                 if use_template:
                     template = PetitionTemplate.objects.get(pk=template_id)
                     if template in org.petitiontemplate_set.all():
-                        petition.prepopulate_from_template(template)
+                        petition.prepopulate_from_template(template, exclude_fields=['text'])
                         petition.save()
                     else:
                         messages.error(self.request, _("This template does not belong to your organization"))
@@ -1086,7 +1086,7 @@ def done(self, form_list, **kwargs):
             if use_template:
                 template = PetitionTemplate.objects.get(pk=template_id)
                 if template in pytitionuser.petitiontemplate_set.all():
-                    petition.prepopulate_from_template(template)
+                    petition.prepopulate_from_template(template, exclude_fields=['text'])
                     petition.save()
                 else:
                     messages.error(self.request, _("This template does not belong to you"))