Merge branch 'master' into icemac-patch-1

CHANGES.rst

@@ -14,6 +14,8 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 - Fix an edge case where the data which was set using ``response.write()`` was
   not returned by ``publish_module``.
 
+- Fix renaming of images and files via ZMI. (#247).
+
 
 4.0b3 (2018-01-27)
 ------------------

docs/zdgbook/ObjectPublishing.rst

@@ -926,6 +926,11 @@ Record marshalling provides you with the ability to create complex
 forms.  However, it is a good idea to keep your web interfaces as
 simple as possible.
 
+Please note, that records do not work with input fields of type radio as you
+might expect, as all radio fields with the same name are considered as one
+group - even if they are in different records. That means, activating one radio
+button will also deactivate all other radio buttons from the other records.
+
 Exceptions
 ----------
 

src/OFS/dtml/renameForm.dtml

@@ -12,14 +12,14 @@
   <td align="left" valign="bottom" width="16"></td>
   <td align="left" valign="bottom">
   <div class="form-text">
-  &dtml-id;
+  &dtml-getId;
   </div>
   </td>
   <td align="left" valign="bottom">
 <dtml-if cb_isMoveable>
   <span class="form-text">to:</span>
-  <input type="hidden" name="ids:list" value="&dtml-id;" />
-  <input type="text" name="new_ids:list" size="<dtml-var "_.max(40,_.len(getId())+4)">" value="&dtml-id;" />
+  <input type="hidden" name="ids:list" value="&dtml-getId;" />
+  <input type="text" name="new_ids:list" size="<dtml-var "_.max(40,_.len(getId())+4)">" value="&dtml-getId;" />
 <dtml-else>
   <span class="form-text">
   may not be renamed.
@@ -33,11 +33,11 @@
 <td></td>
 <td colspan="2">
   <div class="form-element">
-  <input class="form-element" type="hidden" name=":default_method" 
+  <input class="form-element" type="hidden" name=":default_method"
    value="manage_renameObjects" />
-  <input class="form-element" type="submit" name="manage_renameObjects:method" 
+  <input class="form-element" type="submit" name="manage_renameObjects:method"
    value=" Ok " />
-  <input class="form-element" type="submit" name="manage_main:method" 
+  <input class="form-element" type="submit" name="manage_main:method"
    value="Cancel" />
   </div>
 </td>