Skip to content

Commit

Permalink
Merge branch 'master' of github.com:collective/collective.cover
Browse files Browse the repository at this point in the history
  • Loading branch information
rodfersou committed Feb 23, 2015
2 parents 33061c8 + d665382 commit ebc82b6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ There's a frood who really knows where his towel is.
1.0a11 (unreleased)
^^^^^^^^^^^^^^^^^^^

- Don't ignore dropped objects on carousel tiles if the image is added to the object using a Dexterity behavior. (fixes '#473`_`).
[fredvd]

- Fix to check if custom attributes were changed from default value (closes `#476`_).
[rodfersou]

Expand Down
9 changes: 3 additions & 6 deletions src/collective/cover/tiles/carousel.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,13 @@ class CarouselTile(ListTile):
def populate_with_object(self, obj):
"""Add an object to the carousel. This method will append new
elements to the already existing list of items. If the object
does not have an image associated, it will not be included.
does not have an image associated, it will not be included and
silently ignored.
:param uuids: The list of objects' UUIDs to be used
:type uuids: List of strings
"""
try:
image_size = obj.restrictedTraverse('@@images').getImageSize()
except:
image_size = None
if not image_size:
if not self._has_image_field(obj):
return
super(CarouselTile, self).populate_with_object(obj)

Expand Down

0 comments on commit ebc82b6

Please sign in to comment.