GadgetField: handle gadget fields loaded from a web site

product/ERP5Form/GadgetField.py

@@ -41,11 +41,15 @@ class GadgetWidget(Widget.Widget):
     return self.render_view(field, value, REQUEST, render_prefix, key)
 
   def render_view(self, field, value, REQUEST=None, render_prefix=None, key=None):
+    gadget_url = field.get_value('gadget_url')
+    if gadget_url:
+      gadget_component = field.restrictedTraverse(gadget_url, None)
+      if gadget_component is not None:
+        gadget_url = gadget_component.absolute_url()
     kw = {
       'data-gadget-sandbox': field.get_value('js_sandbox'),
       # Duplicate the absolute url logic of xhtml style
-      'data-gadget-url': urljoin(field.getPortalObject().absolute_url() + '/',
-                                 field.get_value('gadget_url')),
+      'data-gadget-url': gadget_url,
       'data-gadget-value': value,
       'data-gadget-renderjs-extra': dumps(dict(field.get_value('renderjs_extra')))
     }