Projet

Général

Profil

0001-backoffice-do-not-show-bo-fields-in-data-history-713.patch

Lauréline Guérin, 17 novembre 2022 09:27

Télécharger (4,89 ko)

Voir les différences:

Subject: [PATCH] backoffice: do not show bo fields in data history (#71385)

 tests/test_content_snapshots.py | 17 +++++++++++++++++
 wcs/workflows.py                |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
tests/test_content_snapshots.py
363 363
    ]
364 364
    block.store()
365 365

  
366
    wf = Workflow(name='xxx')
367
    wf.backoffice_fields_formdef = WorkflowBackofficeFieldsFormDef(wf)
368
    wf.backoffice_fields_formdef.fields = [
369
        fields.StringField(id='bo1', label='Backoffice field', type='string'),
370
    ]
371
    st1 = wf.add_status('Status1')
372
    wf.store()
373

  
366 374
    formdef_class.wipe()
367 375
    formdef = formdef_class()
368 376
    formdef.name = 'foo'
......
389 397
        '_editor': user.roles[0],
390 398
    }
391 399
    formdef.backoffice_submission_roles = user.roles[:]
400
    formdef.workflow_id = wf.id
392 401
    formdef.store()
393 402

  
394 403
    upload1 = PicklableUpload('test.txt', 'text/plain')
......
431 440
            ],
432 441
            'schema': {'5': 'file'},
433 442
        },
443
        'bo1': 'foobar',
434 444
    }
435 445
    formdata.just_created()
436 446
    formdata.store()
......
485 495
            ],
486 496
            'schema': {'5': 'file'},
487 497
        },
498
        'bo1': 'foobar',
488 499
    }
489 500
    evo.add_part(part2)
490 501
    part3 = ContentSnapshotPart(formdata=formdata, old_data=copy.deepcopy(part2.new_data))
......
522 533
            ],
523 534
            'schema': {'5': 'file'},
524 535
        },
536
        'bo1': 'foobar',
525 537
    }
526 538
    evo.add_part(part3)
527 539
    part4 = ContentSnapshotPart(formdata=formdata, old_data=copy.deepcopy(part3.new_data))
......
556 568
            ],
557 569
            'schema': {'5': 'file'},
558 570
        },
571
        'bo1': 'foobar',
559 572
    }
560 573
    evo.add_part(part4)
561 574
    formdata.store()
......
594 607
    assert resp.pyquery('%s li[data-field-id="12_9"]' % ul1_el0).text() == '"Map" set'
595 608
    assert len(resp.pyquery('%s li[data-field-id="12_10"]' % ul1_el0)) == 0
596 609
    assert len(resp.pyquery('%s li[data-field-id="12_11"]' % ul1_el0)) == 0
610
    assert len(resp.pyquery('%s li[data-field-id="bo1"]' % ul1)) == 0
597 611

  
598 612
    assert resp.pyquery(
599 613
        '#evolutions fieldset[data-datetime="%s"] legend' % part2.datetime.isoformat()
......
641 655
    assert resp.pyquery('%s li[data-field-id="12_9"]' % ul2_el1).text() == '"Map" set'
642 656
    assert len(resp.pyquery('%s li[data-field-id="12_10"]' % ul2_el1)) == 0
643 657
    assert len(resp.pyquery('%s li[data-field-id="12_11"]' % ul2_el1)) == 0
658
    assert len(resp.pyquery('%s li[data-field-id="bo1"]' % ul2)) == 0
644 659

  
645 660
    assert resp.pyquery(
646 661
        '#evolutions fieldset[data-datetime="%s"] legend' % part3.datetime.isoformat()
......
698 713
    assert resp.pyquery('%s li[data-field-id="12_9"]' % ul3_el1).text() == '"Map" unset'
699 714
    assert len(resp.pyquery('%s li[data-field-id="12_10"]' % ul3_el1)) == 0
700 715
    assert len(resp.pyquery('%s li[data-field-id="12_11"]' % ul3_el1)) == 0
716
    assert len(resp.pyquery('%s li[data-field-id="bo1"]' % ul3)) == 0
701 717

  
702 718
    assert resp.pyquery(
703 719
        '#evolutions fieldset[data-datetime="%s"] legend' % part4.datetime.isoformat()
......
715 731
    assert len(resp.pyquery('%s li[data-field-id="10"]' % ul4)) == 0
716 732
    assert len(resp.pyquery('%s li[data-field-id="11"]' % ul4)) == 0
717 733
    assert len(resp.pyquery('%s li[data-field-id="12"]' % ul4)) == 0
734
    assert len(resp.pyquery('%s li[data-field-id="bo1"]' % ul4)) == 0
718 735

  
719 736

  
720 737
def test_workflow_formdata_create(pub):
wcs/workflows.py
625 625
                    continue
626 626
                yield from diff_field(field, old_data, new_data, block_field=block_field)
627 627

  
628
        value_diffs = list(diff_fields(self.formdef.get_all_fields(), self.old_data, self.new_data))
628
        value_diffs = list(diff_fields(self.formdef.fields or [], self.old_data, self.new_data))
629 629
        if value_diffs:
630 630
            return template.render(
631 631
                ['wcs/backoffice/content-snapshot-part.html'],
632
-