Merge branch 'master' into zope-security

zopefoundation · Apr 14, 2019 · e1ed5fb · e1ed5fb
2 parents 02303e8 + 226adeb
commit e1ed5fb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -32,6 +32,9 @@ Features
 Other changes
 +++++++++++++
 
+- Remove hardcoded list of factories that don't want an add dialog
+  (`#540 <https://github.com/zopefoundation/Zope/issues/540>`_)
+
 - Increase link visibility in old ZMI forms
   (`#530 <https://github.com/zopefoundation/Zope/issues/530>`_)
 

diff --git a/buildout.cfg b/buildout.cfg
@@ -19,6 +19,7 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
+    Products.ZCatalog
 
 [testenv]
 PYTHONHASHSEED = random

diff --git a/constraints.txt b/constraints.txt
@@ -1,4 +1,4 @@
-AccessControl==4.0b6
+AccessControl==4.0b7
 Acquisition==4.5
 AuthEncoding==4.1
 BTrees==4.5.1

diff --git a/requirements-full.txt b/requirements-full.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
-AccessControl==4.0b6
+AccessControl==4.0b7
 Acquisition==4.5
 AuthEncoding==4.1
 BTrees==4.5.1

diff --git a/src/OFS/dtml/findForm.dtml b/src/OFS/dtml/findForm.dtml
@@ -187,7 +187,6 @@
 		</dtml-in>
 		</select>
 	</div>
-	</div>
 	</td>
 </tr>
 

diff --git a/src/zmi/styles/resources/zmi_base.js b/src/zmi/styles/resources/zmi_base.js
@@ -28,20 +28,14 @@ function addItem( elm, base_url ) {
 
 	// Inserting Without Modal Dialog
 	var no_modal_dialog = {
-		'action':[
-			'manage_addRegistry',
-			'manage_addUserFolder',
-			'manage_addErrorLog',
-			'addPluggableAuthService',
-		],
 		'product':[
 			'CMFPlone',
 			'CMFEditions',
 			'zms',
 		]
 	};
 
-	if ( zmi_dialog != 'modal' || $.inArray(action, no_modal_dialog['action']) !== -1 || $.inArray(product, no_modal_dialog['product']) !== -1 ) {
+	if ( zmi_dialog != 'modal' || $.inArray(product, no_modal_dialog['product']) !== -1 ) {
 		window.location.href = url_full;
 		return
 	}

diff --git a/versions-prod.cfg b/versions-prod.cfg
@@ -4,7 +4,7 @@
 [versions]
 Zope =
 Zope2 = 4.0b1
-AccessControl = 4.0b6
+AccessControl = 4.0b7
 Acquisition = 4.5
 AuthEncoding = 4.1
 BTrees = 4.5.1