Projet

Général

Profil

0001-fields-return-empty-string-as-visualisation-of-empty.patch

Frédéric Péters, 28 avril 2017 09:15

Télécharger (1,79 ko)

Voir les différences:

Subject: [PATCH] fields: return empty string as visualisation of empty file
 fields (#16073)

 tests/test_fields.py | 5 ++++-
 wcs/fields.py        | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)
tests/test_fields.py
100 100

  
101 101
def test_file():
102 102
    upload = Upload('/foo/bar', content_type='text/plain')
103
    assert fields.FileField().get_csv_value(upload) == ['/foo/bar']
103
    assert fields.FileField(id=1).get_csv_value(upload) == ['/foo/bar']
104
    assert fields.FileField(id=1).get_view_value(upload) == '<a download="bar" href="[download]?f=1">/foo/bar</a>'
105
    assert fields.FileField(id=1).get_csv_value(None) == ['']
106
    assert fields.FileField(id=1).get_view_value(None) == ''
104 107

  
105 108
def test_page():
106 109
    formdef = FormDef()
wcs/fields.py
786 786
                'document_type', 'max_file_size', 'allow_portfolio_picking']
787 787

  
788 788
    def get_view_value(self, value):
789
        if not value:
790
            return ''
789 791
        return htmltext('<a download="%s" href="[download]?f=%s">%s</a>') % (
790 792
                value.base_filename, self.id, value)
791 793

  
......
797 799
        return ['%s' % value]
798 800

  
799 801
    def get_json_value(self, value):
802
        if not value:
803
            return {}
800 804
        return {
801 805
            'field_id': self.id,
802 806
            'filename': value.base_filename,
803
-