entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 36 Releases Activity

general: rename "allow_drafts" attribute into "enable_tracking_code"

This commit is contained in:
Frédéric Péters 2015-02-24 13:12:41 +01:00
parent ebe4bc6137
commit bcce7676cc
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
help/fr/api-schema.page
View File

@ -135,7 +135,7 @@ obtenu à l'adresse
{
"name": "Newsletter",
"only_allow_one": "false",
"allow_drafts": "false",
"enable_tracking_codes": "true",
"confirmation": "true",
"discussion": "false",
"fields": [

6
tests/test_form_pages.py
View File

@ -238,7 +238,7 @@ def test_form_tracking_code():
formdef = create_formdef()
formdef.data_class().wipe()
formdef.fields = [fields.StringField(id='0', label='string')]
formdef.allow_drafts = True
formdef.enable_tracking_codes = True
formdef.store()
resp = get_app(pub).get('/test/')
assert '<h3>Tracking code</h3>' in resp.body
@ -294,7 +294,7 @@ def test_form_tracking_code_email():
formdef = create_formdef()
formdef.data_class().wipe()
formdef.fields = [fields.StringField(id='0', label='string')]
formdef.allow_drafts = True
formdef.enable_tracking_codes = True
formdef.store()
formdata = formdef.data_class()()
@ -314,7 +314,7 @@ def test_form_invalid_tracking_code():
formdef = create_formdef()
formdef.data_class().wipe()
formdef.fields = [fields.StringField(id='0', label='string')]
formdef.allow_drafts = True
formdef.enable_tracking_codes = True
formdef.store()
formdata = formdef.data_class()()

6
tests/test_formdef_import.py
View File

@ -64,12 +64,12 @@ def test_boolean_attributes():
formdef.name = 'Foo'
formdef.url_name = 'foo'
formdef.confirmation = True
formdef.allow_drafts = True
formdef.enable_tracking_codes = True
f2 = assert_xml_import_export_works(formdef)
assert f2.allow_drafts == formdef.allow_drafts
assert f2.enable_tracking_codes == formdef.enable_tracking_codes
assert f2.confirmation == formdef.confirmation
f2 = assert_json_import_export_works(formdef)
assert f2.allow_drafts == formdef.allow_drafts
assert f2.enable_tracking_codes == formdef.enable_tracking_codes
assert f2.confirmation == formdef.confirmation
def test_a_field():

14
wcs/admin/forms.py
View File

@ -93,7 +93,7 @@ class FormDefUI(object):
for f in ('name', 'confirmation', 'acl_read',
'only_allow_one', 'category_id', 'disabled',
'allow_drafts', 'workflow_id', 'private_status_and_history',
'enable_tracking_codes', 'workflow_id', 'private_status_and_history',
'disabled_redirection', 'always_advertise',
'publication_date', 'expiration_date'):
widget = form.get_widget(f)
@ -334,8 +334,8 @@ class FormDefPage(Directory):
r += htmltext('<li>%s</li>') % _('Keep workflow status and history private')
if self.formdef.only_allow_one:
r += htmltext('<li>%s</li>') % _('Only allow one form per user')
if self.formdef.allow_drafts:
r += htmltext('<li>%s</li>') % _('Allow user to keep drafts')
if self.formdef.enable_tracking_codes:
r += htmltext('<li>%s</li>') % _('Has support for tracking codes')
if self.formdef.disabled:
r += htmltext('<li>%s ') % _('Disabled')
if self.formdef.disabled_redirection:
@ -539,9 +539,9 @@ class FormDefPage(Directory):
form.add(CheckboxWidget, 'only_allow_one',
title=_('Only allow one form per user'),
value=self.formdef.only_allow_one)
form.add(CheckboxWidget, 'allow_drafts',
title=_('Allow user to keep drafts'),
value=self.formdef.allow_drafts)
form.add(CheckboxWidget, 'enable_tracking_codes',
title=_('Enable support for tracking codes'),
value=self.formdef.enable_tracking_codes)
form.add(CheckboxWidget, 'disabled',
title=_('Disable access to form'),
value=self.formdef.disabled)
@ -564,7 +564,7 @@ class FormDefPage(Directory):
if form.is_submitted() and not form.has_errors():
for f in ('confirmation', 'only_allow_one', 'disabled',
'allow_drafts', 'private_status_and_history',
'enable_tracking_codes', 'private_status_and_history',
'disabled_redirection', 'publication_date', 'expiration_date'):
widget = form.get_widget(f)
if widget:

4
wcs/formdef.py
View File

@ -73,7 +73,7 @@ class FormDef(StorableObject):
detailed_emails = True
disabled = False
only_allow_one = False
allow_drafts = False
enable_tracking_codes = False
disabled_redirection = None
always_advertise = False
publication_date = None
@ -92,7 +92,7 @@ class FormDef(StorableObject):
'publication_date', 'expiration_date',
'disabled_redirection',]
BOOLEAN_ATTRIBUTES = ['discussion', 'detailed_emails', 'disabled',
'only_allow_one', 'allow_drafts',
'only_allow_one', 'enable_tracking_codes',
'always_advertise', 'private_status_and_history']
def migrate(self):

26
wcs/forms/root.py
View File

@ -365,8 +365,8 @@ class FormPage(Directory):
form.add_hidden('page', page_no)
form.add_submit('cancel', _('Cancel'), css_class = 'cancel')
if self.formdef.allow_drafts and not editing:
form.add_submit('savedraft', _('Save As Draft'), css_class = 'save-draft',
if self.formdef.enable_tracking_codes and not editing:
form.add_submit('savedraft', _('Save Draft'), css_class = 'save-draft',
attrs={'style': 'display: none'})
r += form.render()
@ -377,7 +377,7 @@ class FormPage(Directory):
(tracking code and steps).'''
r = TemplateIO(html=True)
r += htmltext('<div id="side">')
if self.formdef.allow_drafts:
if self.formdef.enable_tracking_codes:
r += self.tracking_code_box(data)
r += self.step(step_no, page_no, log_detail, data=data, editing=editing)
r += htmltext('</div> <!-- #side -->')
@ -447,7 +447,7 @@ class FormPage(Directory):
form.add_hidden('magictoken', '-1')
form.add_submit('cancel')
if self.formdef.allow_drafts:
if self.formdef.enable_tracking_codes:
form.add_submit('removedraft')
form.add_submit('savedraft')
@ -506,18 +506,18 @@ class FormPage(Directory):
form = self.formdef.create_form(page_no)
form.add_submit('previous')
if self.formdef.allow_drafts:
if self.formdef.enable_tracking_codes:
form.add_submit('removedraft')
form.add_submit('savedraft')
form.add_submit('submit')
if page_no > 0 and form.get_submit() == 'previous':
return self.previous_page(page_no, magictoken, editing = editing)
if self.formdef.allow_drafts and form.get_submit() == 'removedraft':
if self.formdef.enable_tracking_codes and form.get_submit() == 'removedraft':
self.remove_draft()
return redirect(get_publisher().get_root_url())
if self.formdef.allow_drafts and form.get_submit() == 'savedraft':
if self.formdef.enable_tracking_codes and form.get_submit() == 'savedraft':
form_data = session.get_by_magictoken(magictoken, {})
data = self.formdef.get_data(form)
form_data.update(data)
@ -551,7 +551,7 @@ class FormPage(Directory):
if next_page.is_visible(form_data, self.formdef):
break
if self.formdef.allow_drafts:
if self.formdef.enable_tracking_codes:
draft_id = session.get_by_magictoken(magictoken, {}).get('draft_formdata_id')
if draft_id:
# if there's a draft, update it with current data
@ -583,7 +583,7 @@ class FormPage(Directory):
form.add_hidden('page', '-1')
form.add_hidden('magictoken', '-1')
form.add_submit('cancel')
if self.formdef.allow_drafts:
if self.formdef.enable_tracking_codes:
form.add_submit('removedraft')
form.add_submit('savedraft')
@ -618,11 +618,11 @@ class FormPage(Directory):
if form.get_submit() == 'previous':
return self.previous_page(self.page_number, magictoken, editing = editing)
if self.formdef.allow_drafts and form.get_submit() == 'removedraft':
if self.formdef.enable_tracking_codes and form.get_submit() == 'removedraft':
self.remove_draft()
return redirect(get_publisher().get_root_url())
if self.formdef.allow_drafts and form.get_submit() == 'savedraft':
if self.formdef.enable_tracking_codes and form.get_submit() == 'savedraft':
filled = self.save_draft(form_data, page_no = -1)
return redirect(filled.get_url().rstrip('/'))
@ -849,8 +849,8 @@ class FormPage(Directory):
form.add_submit('submit', _('Submit'))
form.add_submit('cancel', _('Cancel'), css_class = 'cancel')
session = get_session()
if self.formdef.allow_drafts:
form.add_submit('savedraft', _('Save As Draft'), css_class = 'save-draft',
if self.formdef.enable_tracking_codes:
form.add_submit('savedraft', _('Save Draft'), css_class = 'save-draft',
attrs={'style': 'display: none'})
form.add_hidden('step', '2')
magictoken = get_request().form['magictoken']