delete formdef.views (useless with new backoffice)

This commit is contained in:
Thomas NOËL 2012-10-04 11:28:22 +02:00
parent 5d3d529241
commit 41f5570365
3 changed files with 9 additions and 97 deletions

View File

@ -202,8 +202,7 @@ class FormDefPage(Directory):
'archive', 'invite', 'enable', 'workflow', 'category',
'recipient', ('workflow-options', 'workflow_options'),
('workflow-status-remapping', 'workflow_status_remapping'),
'roles', 'title', 'options', ('acl-read', 'acl_read'),
'views']
'roles', 'title', 'options', ('acl-read', 'acl_read')]
def __init__(self, component):
try:
@ -334,7 +333,6 @@ class FormDefPage(Directory):
def get_sidebar [html] (self):
'<ul>'
'<li><a href="views">%s</a></li>' % _('Views')
'<li><a href="delete" rel="popup">%s</a></li>' % _('Delete')
'<li><a href="duplicate">%s</a></li>' % _('Duplicate')
if ET:
@ -962,76 +960,6 @@ class FormDefPage(Directory):
self.formdef.workflow_options[widget.name] = widget.parse()
self.formdef.store()
def views [html] (self):
form = Form(enctype='multipart/form-data')
if self.formdef.views:
view_backoffice_summary = self.formdef.views.get('backoffice_summary')
else:
view_backoffice_summary = None
form.add(StringWidget, 'backoffice_summary',
title = _('Backoffice summary'), size=80,
value = view_backoffice_summary)
form.add_submit('submit', _('Submit'))
form.add_submit('cancel', _('Cancel'))
if form.get_widget('cancel').parse():
return redirect('.')
if not form.is_submitted() or form.has_errors():
get_response().breadcrumb.append(('views', _('Views')))
html_top('forms', title = _('Views'))
'<h2>%s</h2>' % _('Views')
'<p>%s</p>' % _('Common substitution variables are available with the [variable] syntax.')
form.render()
else:
return self.views_submit(form)
def views_submit(self, form):
if not self.formdef.views:
self.formdef.views = {}
for v in ('backoffice_summary', ):
widget = form.get_widget(v)
if widget:
self.formdef.views[v] = widget.parse()
self.formdef.store()
return redirect('.')
def views [html] (self):
form = Form(enctype='multipart/form-data')
if self.formdef.views:
view_backoffice_summary = self.formdef.views.get('backoffice_summary')
else:
view_backoffice_summary = None
form.add(StringWidget, 'backoffice_summary',
title = _('Backoffice summary'), size=80,
value = view_backoffice_summary)
form.add_submit('submit', _('Submit'))
form.add_submit('cancel', _('Cancel'))
if form.get_widget('cancel').parse():
return redirect('.')
if not form.is_submitted() or form.has_errors():
get_response().breadcrumb.append(('views', _('Views')))
html_top('forms', title = _('Views'))
'<h2>%s</h2>' % _('Views')
'<p>%s</p>' % _('Common substitution variables are available with the [variable] syntax.')
form.render()
else:
return self.views_submit(form)
def views_submit(self, form):
if not self.formdef.views:
self.formdef.views = {}
for v in ('backoffice_summary', ):
widget = form.get_widget(v)
if widget:
self.formdef.views[v] = widget.parse()
self.formdef.store()
return redirect('.')
class FormsDirectory(Directory):
_q_exports = ['', 'new', ('import', 'p_import')]

View File

@ -321,9 +321,15 @@ class FormPage(Directory):
'<ul>'
for f in status_forms:
'<li><a href="%s/">%s</a></li>' % (
try:
u = get_publisher().user_class.get(f.user_id)
userlabel = u.display_name
except KeyError:
userlabel = _('unknown user')
'<li><a href="%s/">%s, %s</a></li>' % (
f.id,
self.formdef.get_backoffice_summary_form(f))
misc.localstrftime(f.receipt_time),
userlabel)
'</ul>'
'</div>'
'</div>'

View File

@ -81,8 +81,6 @@ class FormDef(StorableObject):
publication_date = None
expiration_date = None
views = None
acl_read = 'owner' # one of ('none', 'owner', 'roles', 'all')
private_status_and_history = False
@ -440,26 +438,6 @@ class FormDef(StorableObject):
details.append('')
return '\n'.join(details)
def get_view_form(self, formdata, view):
if self.views is None or self.views.get(view) is None:
return None
get_publisher().substitutions.feed(formdata)
return template_on_formdata(formdata, self.views[view])
def get_backoffice_summary_form(self, formdata):
summary = self.get_view_form(formdata, 'backoffice_summary')
if summary is None:
try:
u = get_publisher().user_class.get(formdata.user_id)
userlabel = u.display_name
except KeyError:
if formdata.user_hash:
userlabel = _('anonymous user')
else:
userlabel = _('unknown user')
summary = '%s, %s' % (localstrftime(formdata.receipt_time), userlabel)
return summary
def get_submitter_email(self, formdata):
users_cfg = get_cfg('users', {})
field_email = users_cfg.get('field_email') or 'email'