Feed substitution vars for workflows. Add form_uri

fix #634 http://dev.entrouvert.org/issues/634
This commit is contained in:
Thomas NOËL 2011-08-01 14:04:02 +00:00
parent 453b76a537
commit 4da41a2b3b
1 changed files with 3 additions and 0 deletions

View File

@ -129,6 +129,7 @@ class FormData(StorableObject):
def perform_workflow(self):
url = None
get_publisher().substitutions.feed(self)
if self.status.startswith('wf-'):
wf_status = self.get_workflow_status()
url = wf_status.perform_items(self)
@ -208,6 +209,7 @@ class FormData(StorableObject):
'form_receipt_time': qommon.strftime.strftime('%H:%M', self.receipt_time),
'form_number': str(self.id),
'form_url': self.get_url(),
'form_uri': '%s/%s/' % (self.formdef.url_name, self.id),
'form_status_url': '%sstatus' % self.get_url(),
'form_details': self.formdef.get_detailed_email_form(self, self.get_url()),
}
@ -274,6 +276,7 @@ Substitutions.register('form_receipt_time', category=N_('Form'), comment=N_('For
Substitutions.register('form_number', category=N_('Form'), comment=N_('Form Number'))
Substitutions.register('form_details', category=N_('Form'), comment=N_('Form Details'))
Substitutions.register('form_url', category=N_('Form'), comment=N_('Form URL'))
Substitutions.register('form_uri', category=N_('Form'), comment=N_('Form URI'))
Substitutions.register('form_status_url', category=N_('Form'), comment=N_('Form Status URL'))
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'))