Projet

Général

Profil

0001-workflows-model_file-display-in-inspect-view-34626.patch

Lauréline Guérin, 30 juin 2020 22:42

Télécharger (3,29 ko)

Voir les différences:

Subject: [PATCH 1/2] workflows: model_file display in inspect view (#34626)

 tests/test_backoffice_pages.py | 23 +++++++++++++++++++++++
 wcs/wf/export_to_model.py      |  4 ++++
 2 files changed, 27 insertions(+)
tests/test_backoffice_pages.py
26 26
from webtest import Upload
27 27

  
28 28
from quixote import cleanup, get_publisher, get_response
29
from quixote.http_request import Upload as QuixoteUpload
29 30
from wcs.qommon import ods
30 31
from wcs.api_utils import sign_url
31 32
from wcs.qommon import errors, sessions
32 33
from wcs.qommon.form import PicklableUpload
34
from wcs.qommon.form import UploadedFile
33 35
from wcs.qommon.ident.password_accounts import PasswordAccount
34 36
from wcs.qommon.http_request import HTTPRequest
35 37
from wcs.qommon.substitution import CompatibilityNamesDict
......
41 43
        WorkflowBackofficeFieldsFormDef)
42 44
from wcs.wf.backoffice_fields import SetBackofficeFieldsWorkflowStatusItem
43 45
from wcs.wf.dispatch import DispatchWorkflowStatusItem
46
from wcs.wf.export_to_model import ExportToModel
44 47
from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
45 48
from wcs.wf.jump import JumpWorkflowStatusItem
46 49
from wcs.wf.wscall import WebserviceCallStatusItem
......
5763 5766
        '<li>file → =form_var_toto_file_raw</li>'
5764 5767
        '<li>#2 → =form_var_foobar_raw</li></ul>') in resp.text
5765 5768

  
5769
    st3 = workflow.add_status('Status3', 'st3')
5770
    export_to = ExportToModel()
5771
    export_to.convert_to_pdf = False
5772
    export_to.label = 'create doc'
5773
    upload = QuixoteUpload('/foo/test.rtf', content_type='application/rtf')
5774
    upload.fp = BytesIO()
5775
    upload.fp.write(b'HELLO WORLD')
5776
    upload.fp.seek(0)
5777
    export_to.model_file = UploadedFile(pub.app_dir, None, upload)
5778
    export_to.id = '_export_to'
5779
    export_to.by = ['_submitter']
5780
    st3.items.append(export_to)
5781
    export_to.parent = st3
5782
    workflow.store()
5783

  
5784
    resp = app.get('/backoffice/workflows/%s/inspect' % workflow.id)
5785
    assert (
5786
        '<li><span class="parameter">Model:</span> '
5787
        '<a href="status/st3/items/_export_to/?file=model_file">test.rtf</a></li>') in resp.text
5788

  
5766 5789

  
5767 5790
def test_workflow_comment_required(pub):
5768 5791
    user = create_user(pub)
wcs/wf/export_to_model.py
378 378
            form.add(ComputedExpressionWidget, name='%sfilename' % prefix, title=_('File name'),
379 379
                     value=self.filename)
380 380

  
381
    def get_model_file_parameter_view_value(self):
382
        return htmltext('<a href="status/%s/items/%s/?file=model_file">%s</a>') % (
383
            self.parent.id, self.id, self.model_file.base_filename)
384

  
381 385
    def get_filename(self):
382 386
        filename = None
383 387
        if self.filename:
384
-