From 923de50dba67c6d408cc714b99fa6f1d3c74e8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 7 Jan 2016 11:58:41 +0100 Subject: [PATCH 2/3] backoffice: use display id in "related user forms" (#9537) --- wcs/backoffice/management.py | 8 ++++++-- wcs/qommon/static/css/dc2/admin.css | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py index b7dd7f4..91a099b 100644 --- a/wcs/backoffice/management.py +++ b/wcs/backoffice/management.py @@ -1687,16 +1687,20 @@ class FormBackOfficeStatusPage(FormStatusPage): misc.date_format(), formdata.receipt_time) if str(formdata.formdef_id) == str(self.formdef.id) and ( str(formdata.id) == str(self.filled.id)): - r += htmltext('
  • %s, ' + r += htmltext('
  • %s ' + '(%s), ' '%s ' '(%s)' % ( formdata.formdef.name, + formdata.get_display_id(), submit_date, status_label)) else: - r += htmltext('
  • %s, ' + r += htmltext('
  • %s ' + '(%s), ' '%s ' '(%s)' % ( formdata.get_url(backoffice=True), + formdata.get_display_id(), formdata.formdef.name, submit_date, status_label)) r += htmltext('') diff --git a/wcs/qommon/static/css/dc2/admin.css b/wcs/qommon/static/css/dc2/admin.css index 3bfc3b8..bc1c879 100644 --- a/wcs/qommon/static/css/dc2/admin.css +++ b/wcs/qommon/static/css/dc2/admin.css @@ -1155,6 +1155,7 @@ div.user-pending-forms ul li.self span.formname { font-weight: bold; } +div.user-pending-forms span.id, div.user-pending-forms span.datetime, div.user-pending-forms span.status { font-size: 80%; -- 2.7.0.rc3