From 11e11f9fe0540dd103c924e879726c057a5622f5 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Sat, 23 Jan 2016 00:20:11 +0100 Subject: [PATCH] fold summary and log if form has already been seen (#9175) --- wcs/forms/common.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/wcs/forms/common.py b/wcs/forms/common.py index d3d888d..0794fa2 100644 --- a/wcs/forms/common.py +++ b/wcs/forms/common.py @@ -183,6 +183,15 @@ class FormStatusPage(Directory): return r.getvalue() + def deja_vu(self): + user = get_request().user + if not self.filled.evolution or not user: + return False + for evo in self.filled.evolution: + if evo.who == user.id or (evo.who == '_submitter' and self.filled.is_submitter(user)): + return True + return False + def _q_index(self): mine = self.check_auth() get_logger().info('form %s - id: %s - view' % (self.formdef.name, self.filled.id)) @@ -191,9 +200,10 @@ class FormStatusPage(Directory): r = TemplateIO(html=True) + deja_vu = self.deja_vu() r += self.receipt_message(mine=mine) - r += self.receipt() - r += self.history() + r += self.receipt(deja_vu=deja_vu) + r += self.history(deja_vu=deja_vu) form = None @@ -233,14 +243,14 @@ class FormStatusPage(Directory): r += htmltext('') return r.getvalue() - def history(self): + def history(self, deja_vu=False): if not self.filled.evolution: return if not self.formdef.is_user_allowed_read_status_and_history(get_request().user, self.filled): return r = TemplateIO(html=True) r += htmltext('
') - r += htmltext('

%s

') % _('Log') + r += htmltext('

%%s

' % (deja_vu and ' folded' or '')) % _('Log') r += htmltext('