Projet

Général

Profil

0001-workflows-better-wording-for-create-formdata-action-.patch

Lauréline Guérin, 07 février 2022 09:18

Télécharger (3,35 ko)

Voir les différences:

Subject: [PATCH] workflows: better wording for create formdata action (#57714)

 tests/workflow/test_formdata.py |  9 +++++----
 wcs/wf/create_formdata.py       | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)
tests/workflow/test_formdata.py
261 261
    formdata.perform_workflow()
262 262
    assert target_formdef.data_class().count() == 1
263 263
    assert formdata.evolution[-1].parts[0].attach_to_history is True
264
    assert 'Created new form' in str(formdata.evolution[-1].parts[0].view())
265
    assert target_formdef.get_url() in str(formdata.evolution[-1].parts[0].view())
264
    assert 'New form <a href="%s1/">"target form 1"</a> created' % target_formdef.get_url() in str(
265
        formdata.evolution[-1].parts[0].view()
266
    )
266 267

  
267 268
    # don't crash in case target formdata is removed
268 269
    formdata.refresh_from_storage()
269 270
    target_formdef.data_class().wipe()
270
    assert 'deleted' in str(formdata.evolution[-1].parts[0].view())
271
    assert 'New form created (deleted, 1-1)' in str(formdata.evolution[-1].parts[0].view())
271 272

  
272 273
    # don't crash in case target formdef is removed
273 274
    target_formdef.remove_self()
274 275
    formdata.refresh_from_storage()
275
    assert 'deleted' in str(formdata.evolution[-1].parts[0].view())
276
    assert 'New form created (deleted, 1-1)' in str(formdata.evolution[-1].parts[0].view())
276 277

  
277 278

  
278 279
def test_create_formdata_card_item_mapping(two_pubs):
wcs/wf/create_formdata.py
184 184
                if formdata is None:
185 185
                    raise KeyError
186 186
            except KeyError:
187
                # formdef or formdata deleted
187 188
                return htmltext('<p class="wf-links">%s (%s, %s-%s)</p>') % (
188
                    _('Created new form'),
189
                    _('New form created'),
189 190
                    _('deleted'),
190 191
                    self.formdef_id,
191 192
                    self.formdata_id,
192 193
                )
193
            return htmltext('<p class="wf-links">%s <a href="%s">%s %s</a>') % (
194
                _('Created new form'),
195
                formdata.get_url(backoffice=bool(get_request() and get_request().is_in_backoffice())),
196
                self.formdef.name if self.formdef else _('Deleted'),
197
                self.formdata_id,
194
            result = htmltext('<p class="wf-links">')
195
            result += htmltext(
196
                _('New form %s created')
197
                % (
198
                    htmltext('<a href="%s">"%s %s"</a>')
199
                    % (
200
                        formdata.get_url(backoffice=bool(get_request() and get_request().is_in_backoffice())),
201
                        self.formdef.name,
202
                        self.formdata_id,
203
                    )
204
                )
198 205
            )
206
            result += htmltext('</p>')
207
            return result
199 208
        else:
200 209
            return ''
201 210

  
202
-