From e1fc476dd4c0075d9c1f3b8b20979237e8c7d99e Mon Sep 17 00:00:00 2001
From: Thomas NOEL <tnoel@entrouvert.com>
Date: Fri, 21 Aug 2015 14:40:59 +0200
Subject: [PATCH] add form_tracking_code variable (#8082)

---
 help/fr/misc-substvars.page | 4 ++++
 wcs/formdata.py             | 4 ++++
 wcs/forms/root.py           | 5 +++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/help/fr/misc-substvars.page b/help/fr/misc-substvars.page
index c51ae39..0fc3e8d 100644
--- a/help/fr/misc-substvars.page
+++ b/help/fr/misc-substvars.page
@@ -127,6 +127,10 @@ champs, etc.
       <td><p><code>form_url_backoffice</code></p></td>
       <td><p>L'adresse vers le formulaire dans le backoffice</p></td>
     </tr>
+    <tr>
+      <td><p><code>form_tracking_code</code></p></td>
+      <td><p>Le code de suivi du formulaire, s'il existe</p></td>
+    </tr>
     </table>
   </section>
 
diff --git a/wcs/formdata.py b/wcs/formdata.py
index 13c4297..9c53700 100644
--- a/wcs/formdata.py
+++ b/wcs/formdata.py
@@ -362,6 +362,9 @@ class FormData(StorableObject):
             is_endpoint_status = (self.status in endpoint_status_ids)
             d['form_status_is_endpoint'] = is_endpoint_status
 
+        if self.tracking_code:
+            d['form_tracking_code'] = self.tracking_code
+
         # formdef and category variables
         d.update(self.formdef.get_substitution_variables(minimal=minimal))
 
@@ -610,6 +613,7 @@ Substitutions.register('form_details', category=N_('Form'), comment=N_('Form Det
 Substitutions.register('form_url', category=N_('Form'), comment=N_('Form URL'))
 Substitutions.register('form_url_backoffice', category=N_('Form'), comment=N_('Form URL (backoffice)'))
 Substitutions.register('form_status_url', category=N_('Form'), comment=N_('Form Status URL'))
+Substitutions.register('form_tracking_code', category=N_('Form'), comment=N_('Form Tracking Code'))
 Substitutions.register('form_user', category=N_('Form'), comment=N_('Form Submitter'))
 Substitutions.register('form_user_display_name', category=N_('Form'), comment=N_('Form Submitter Name'))
 Substitutions.register('form_user_email', category=N_('Form'), comment=N_('Form Submitter Email'))
diff --git a/wcs/forms/root.py b/wcs/forms/root.py
index aa682c4..15823a6 100644
--- a/wcs/forms/root.py
+++ b/wcs/forms/root.py
@@ -155,6 +155,7 @@ class TrackingCodeDirectory(Directory):
         if form.is_submitted() and not form.has_errors():
             email = form.get_widget('email').parse()
             data = {
+                    'form_tracking_code': self.code,
                     'tracking_code': self.code,
                     'email': email
                     }
@@ -1415,12 +1416,12 @@ TextsDirectory.register('tracking-code-short-text',
 
 EmailsDirectory.register('tracking-code-reminder',
         N_('Tracking Code'),
-        N_('Available variables: email, form, tracking_code'),
+        N_('Available variables: email, form_name, form_tracking_code'),
         category = N_('Miscellaneous'),
         default_subject = N_('Tracking Code reminder'),
         default_body = N_('''\
 Hello,
 
-As a reminder your tracking code for [form_name] is [tracking_code].
+As a reminder your tracking code for [form_name] is [form_tracking_code].
 
 '''))
-- 
2.5.0