ERP5Form: remove fake 'target' property on proxy fields

product/ERP5Form/ProxyField.py

@@ -92,7 +92,6 @@ class ProxyWidget(Widget.Widget):
   property_names = [
     'form_id',
     'field_id',
-    'target',
   ]
 
   form_id = fields.StringField(
@@ -113,14 +112,6 @@ class ProxyWidget(Widget.Widget):
                                 display_width=40,
                                 required=1)
 
-  target = fields.HyperLinkField(
-                                'target',
-                                title='Proxy Target',
-                                description="Link to the master field edit form.",
-                                default='Click to edit the target',
-                                href='manage_edit_target',
-                                required=0)
-
   # Field API Methods, delegated to the template field widget
   render = WidgetDelegatedMethod('render', default='')
   render_htmlgrid = WidgetDelegatedMethod('render_htmlgrid', default='')
@@ -570,14 +561,26 @@ class ProxyField(ZMIField):
     return self.overrides.get(id, "")
 
   security.declareProtected('Edit target', 'manage_edit_target')
-  def manage_edit_target(self, REQUEST):
+  def manage_edit_target(self, RESPONSE):
+    """
+    Edit target field of this proxy
+    """
+    proxy_field = self.getTemplateField()
+    if proxy_field:
+      RESPONSE.redirect(proxy_field.absolute_url() + "/manage_main")
+    else:
+      # FIXME: should show some error message
+      # ("form_id and field_id don't define a valid template")
+      pass
+
+  security.declareProtected('Edit target', 'manage_tales_target')
+  def manage_tales_target(self, RESPONSE):
     """
     Edit target field of this proxy
     """
     proxy_field = self.getTemplateField()
     if proxy_field:
-      url = "%s/manage_main" % proxy_field.absolute_url()
-      REQUEST.RESPONSE.redirect(url)
+      RESPONSE.redirect(proxy_field.absolute_url() + "/manage_talesForm")
     else:
       # FIXME: should show some error message
       # ("form_id and field_id don't define a valid template")

product/ERP5Form/dtml/proxyFieldEdit.dtml

@@ -54,6 +54,16 @@ Surcharge <dtml-var meta_type> properties here.
   </dtml-let>
   </dtml-in>
 
+    <tr>
+      <td align="left" valign="top">
+        <div class="form-label">Proxy Target</div>
+      </td>
+      <td align="left" valign="top">
+        <a href="manage_edit_target">Click to edit the target</a>
+      </td>
+      <td></td><td></td>
+    </tr>
+
 </table>
 <table cellspacing="0" cellpadding="2" border="0">
 <!-- Then, display Template Field properties -->

product/ERP5Form/dtml/proxyFieldTales.dtml

@@ -53,6 +53,16 @@ This tab can therefore not be used.
   </dtml-let>
   </dtml-in>
 
+    <tr>
+      <td align="left" valign="top">
+        <div class="form-label">Proxy Target</div>
+      </td>
+      <td align="left" valign="top">
+        <a href="manage_tales_target">Click to edit the target</a>
+      </td>
+      <td></td>
+    </tr>
+
 </table>
 <table cellspacing="0" cellpadding="2" border="0">