Projet

Général

Profil

0001-wip.patch

Lauréline Guérin, 11 février 2021 16:20

Télécharger (3,04 ko)

Voir les différences:

Subject: [PATCH] wip

 wcs/backoffice/management.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
wcs/backoffice/management.py
1376 1376
            elif filter_field.type == 'user-id':
1377 1377
                r += HiddenWidget(filter_field_key, value=filter_field_value).render()
1378 1378
                if filter_field_value:
1379
                    filtered_user = get_publisher().user_class.get(filter_field_value, ignore_errors=True)
1379
                    if filter_field_value == '__current__':
1380
                        filtered_user_value = _('Current user')
1381
                    else:
1382
                        filtered_user = get_publisher().user_class.get(filter_field_value, ignore_errors=True)
1383
                        filtered_user_value = filtered_user.display_name if filtered_user else _('Unknown')
1380 1384
                    widget = StringWidget(
1381 1385
                        '_' + filter_field_key,
1382 1386
                        title=filter_field.label,
1383
                        value=filtered_user.display_name if filtered_user else _('Unknown'),
1387
                        value=filtered_user_value,
1384 1388
                        readonly=True,
1385 1389
                        render_br=False,
1386 1390
                    )
......
1857 1861
                        filters_dict['filter-user-value'] = str(nameid_users[0].id)
1858 1862
                        request_form['filter-user-value'] = filters_dict['filter-user-value']
1859 1863
                    else:
1860
                        filters_dict['filter-user-value'] = '-1'
1861
                        request_form['filter-user-value'] = '-1'
1864
                        filters_dict['filter-user-value'] = (
1865
                            '__current__' if name_id == '__current__' else '-1'
1866
                        )
1867
                        request_form['filter-user-value'] = (
1868
                            '__current__' if name_id == '__current__' else '-1'
1869
                        )
1862 1870

  
1863 1871
            if filter_field.type == 'submission-agent-id':
1864 1872
                # convert uuid based filter into local id filter
......
1903 1911
                    criterias.append(LessOrEqual('last_update_time', filter_date_value))
1904 1912
                criterias[-1]._label = '%s: %s' % (filter_field.label, filter_field_value)
1905 1913
            elif filter_field.type == 'user-id':
1914
                if filter_field_value == '__current__' and get_request().user:
1915
                    filter_field_value = str(get_request().user.id)
1906 1916
                criterias.append(Equal('user_id', filter_field_value))
1907 1917
            elif filter_field.type == 'submission-agent-id':
1908 1918
                criterias.append(Equal('submission_agent_id', filter_field_value))
1909
-