diff --git a/product/ERP5Form/ImageField.py b/product/ERP5Form/ImageField.py index 7a8c4b11083f031b081239478e7af8771934cebf..9023d672ab05fc23439d4cc83d4fde4a85d4c1f3 100644 --- a/product/ERP5Form/ImageField.py +++ b/product/ERP5Form/ImageField.py @@ -169,21 +169,21 @@ class ImageFieldWidget(Widget.TextWidget): if (image_object.getWidth(), image_object.getHeight()) not in \ ((-1, -1), (0,0)): width, height = image_object._getAspectRatioSize(width, height) - if draw_frame_node.attrib.get('{%s}width' % SVG_URI, {}) != {} and \ - draw_frame_node.attrib.get('{%s}height' % SVG_URI, {}) != {}: + if draw_frame_node.attrib.get('{%s}width' % SVG_URI) and \ + draw_frame_node.attrib.get('{%s}height' % SVG_URI): # if a size already exist from attr_dict, try to resize the image to # fit this size (image should not be biger than size from attr_dict) # devide the value by 20 to have cm instead of px width, height = self._getPictureSize(width/20., height/20., - target_width=draw_frame_node.attrib.get('{%s}width' % SVG_URI, {}), - target_height=draw_frame_node.attrib.get('{%s}height' % SVG_URI, {})) + target_width=draw_frame_node.attrib.get('{%s}width' % SVG_URI, ''), + target_height=draw_frame_node.attrib.get('{%s}height' % SVG_URI, '')) draw_frame_node.set('{%s}width' % SVG_URI, str(width)) draw_frame_node.set('{%s}height' % SVG_URI, str(height)) image_tag_name = '{%s}%s' % (DRAW_URI, 'image') image_node = Element(image_tag_name, nsmap=NSMAP) - image_node.attrib.update(attr_dict.get(image_tag_name, {}).pop()) + image_node.attrib.update(attr_dict.get(image_tag_name, []).pop()) image_node.set('{%s}href' % XLINK_URI, picture_path) draw_frame_node.append(image_node)