Merge d502e06 into 5e98b2f

CHANGES.rst

@@ -7,7 +7,10 @@ Changelog
 
 - Add support for Python 3.9
 
-- change package structure to move package code into a ``src`` subfolder
+- Change package structure to move package code into a ``src`` subfolder.
+
+- Fix bug which prevented ZMI from rendering, when Products.ExternalEdit was
+  installed.
 
 
 3.0.1 (2020-10-30)

setup.py

@@ -50,8 +50,4 @@
           'Zope >= 4.3',
           'six',
       ],
-      entry_points="""
-      [console_scripts]
-          zopeedit=Products.ExternalEditor.zopeedit:main
-      """,
       )

src/Products/ExternalEditor/ExternalEditor.py

@@ -20,7 +20,7 @@
 from AccessControl.SecurityManagement import getSecurityManager
 from AccessControl.class_init import InitializeClass
 from Acquisition import aq_inner, aq_base, aq_parent, Implicit
-from App.Common import rfc1123_date
+from zope.datetime import rfc1123_date
 from OFS import Image
 from OFS.Lockable import wl_isLocked
 from six.moves import urllib

src/Products/ExternalEditor/tests/test_zmi.py

@@ -0,0 +1,25 @@
+import Testing.testbrowser
+import Testing.ZopeTestCase
+import Zope2.App
+
+
+class ZMITests(Testing.ZopeTestCase.FunctionalTestCase):
+    """Testing the ZMI rendering."""
+
+    def setUp(self):
+        super(ZMITests, self).setUp()
+
+        Zope2.App.zcml.load_site(force=True)
+
+        uf = self.app.acl_users
+        uf.userFolderAddUser('manager', 'manager_pass', ['Manager'], [])
+        self.app.manage_addProduct['OFSP'].addDTMLMethod('meth')
+
+    def test_ZMI(self):
+        """It renders a link to to external edit."""
+        browser = Testing.testbrowser.Browser()
+        browser.login('manager', 'manager_pass')
+        browser.open('http://localhost/manage_main')
+        link = browser.getLink(url='meth.zem')
+        self.assertEqual(link.attrs['title'], 'Edit using external editor')
+        self.assertEqual(link.url, 'http://localhost/externalEdit_/meth.zem')

src/Products/ExternalEditor/zpt/main.zpt

@@ -6,7 +6,7 @@
   <form name="objectItems"
         method="post"
         tal:define="has_order_support python:getattr(here.aq_explicit, 'has_order_support', 0);
-                    sm modules/AccessControl/SecurityManagement/getSecurityManager;
+                    sm modules/AccessControl/getSecurityManager;
                     default_sort python: 'position' if has_order_support else 'id';
                     skey python:request.get('skey',default_sort);
                     rkey python:request.get('rkey','asc');