Projet

Général

Profil

0001-assets-fix-asset_url-templatetag-when-file-does-not-.patch

Lauréline Guérin, 14 octobre 2019 11:57

Télécharger (1,92 ko)

Voir les différences: 

Subject: [PATCH] assets: fix asset_url templatetag when file does not exist
 (#33959)


 combo/apps/assets/templatetags/assets.py | 2 +-
 tests/test_public_templatetags.py        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
combo/apps/assets/templatetags/assets.py
52 52 
        return ''
53 53 

  		




  54
  54
  
    
    geometry_string = kwargs.pop('size', None)

  		




  55
  
  
    
    if not geometry_string or asset.file.name.endswith('svg'):

  		




  
  55
  
    
    if not geometry_string or asset.name.endswith('svg'):

  		




  56
  56
  
    
        return asset.url

  		




  57
  57
  
    

  		




  58
  58
  
    
    return get_thumbnail(asset, geometry_string, **kwargs).url

  		












  

    
      tests/test_public_templatetags.py
    
  





  186
  186
  
    
        page.save()

  		




  187
  187
  
    
        t = Template('''{% load assets %}{% asset_url page.picture "collectivity:banner" size="200x200" %}''')

  		




  188
  188
  
    
        assert t.render(Context({'page': page})) == '/media/page-pictures/test2.svg'

  		




  
  189
  
    

  		




  
  190
  
    
        # file does not exist, return a placeholder

  		




  
  191
  
    
        os.remove(page.picture.path)

  		




  
  192
  
    
        del page.picture.file

  		




  
  193
  
    
        t = Template('''{% load assets %}{% asset_url page.picture "collectivity:banner" %}''')

  		




  
  194
  
    
        assert t.render(Context({'page': page})) == '/media/page-pictures/test2.svg'

  		




  
  195
  
    
        t = Template('''{% load assets %}{% asset_url page.picture "collectivity:banner" size="200x200" %}''')

  		




  
  196
  
    
        assert t.render(Context({'page': page})) == '/media/page-pictures/test2.svg'

  		




  189
  
  
    
-