Projet

Général

Profil

0001-fold-summary-and-log-if-form-has-already-been-seen-9.patch

Thomas Noël, 04 février 2016 18:00

Télécharger (2,8 ko)

Voir les différences:

Subject: [PATCH] fold summary and log if form has already been seen (#9175)

 wcs/forms/common.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)
wcs/forms/common.py
192 192

  
193 193
        return r.getvalue()
194 194

  
195
    def deja_vu(self):
196
        user = get_request().user
197
        if not self.filled.evolution or not user:
198
            return False
199
        for evo in self.filled.evolution:
200
            if (str(evo.who) == str(user.id) or
201
                    (evo.who == '_submitter' and self.filled.is_submitter(user))):
202
                return True
203
        return False
204

  
195 205
    def _q_index(self):
196 206
        mine = self.check_auth()
197 207
        get_logger().info('form %s - id: %s - view' % (self.formdef.name, self.filled.id))
......
200 210

  
201 211
        r = TemplateIO(html=True)
202 212

  
213
        deja_vu = self.deja_vu()
203 214
        r += self.receipt_message(mine=mine)
204
        r += self.receipt()
215
        r += self.receipt(deja_vu=deja_vu)
205 216
        r += self.history()
206 217

  
207 218
        form = None
......
331 342

  
332 343
            r += htmltext('</div>')
333 344
            r += htmltext('</li>')
345

  
334 346
        r += htmltext('</ul>')
335 347
        r += htmltext('</div>') # .bo-block #evolution-log
336 348
        return r.getvalue()
......
347 359
            raise errors.AccessForbiddenError()
348 360
        return user
349 361

  
350
    def receipt(self,
351
            always_include_user = False,
352
            show_status = True,
353
            form_url = ''):
362
    def receipt(self, always_include_user=False, show_status=True, form_url='', deja_vu=False):
354 363
        user = get_request().user
355 364
        if not always_include_user and get_request().user and \
356 365
                get_request().user.id == self.filled.user_id:
......
372 381

  
373 382
        r = TemplateIO(html=True)
374 383
        r += htmltext('<div class="bo-block" id="summary">')
375
        r += htmltext('<h2 class="foldable">%s</h2>') % _('Summary')
384
        r += htmltext('<h2 class="foldable%s">%%s</h2>' %
385
                      (' folded' if deja_vu else '')) % _('Summary')
376 386
        r += htmltext('<div class="dataview">')
377 387

  
378 388
        if user:
......
494 504

  
495 505
        r += htmltext(self.workflow_messages())
496 506

  
497
        r += self.receipt(always_include_user = True)
507
        deja_vu = self.deja_vu()
508
        r += self.receipt(always_include_user=True, deja_vu=deja_vu)
498 509

  
499 510
        r += self.history()
500 511

  
501
-