Fix standalone zodbbrowser when used with Zope 2

Fixes #10.
mgedmin · Feb 25, 2015 · 545c92d · 545c92d
1 parent 9bda2e7
commit 545c92d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,10 +1,11 @@
 Changes
 -------
 
-0.14.0 (unreleased)
+0.12.0 (unreleased)
 ~~~~~~~~~~~~~~~~~~~
 
 - Show request URLs in history record headers (GH #7).
+- Fix standalone zodbbrowser when used with Zope 2 packages (GH #10).
 
 
 0.11.2 (2015-01-09)

diff --git a/src/zodbbrowser/browser.zcml b/src/zodbbrowser/browser.zcml
@@ -4,8 +4,13 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain='zodbbrowser'>
 
-  <include file="browser-zope2.zcml" zcml:condition="installed Products.Five" />
-  <include file="browser-zope3.zcml" zcml:condition="not-installed Products.Five" />
+  <configure zcml:condition="have standalone-zodbbrowser">
+    <include file="browser-zope3.zcml" />
+  </configure>
+  <configure zcml:condition="not-have standalone-zodbbrowser">
+    <include file="browser-zope2.zcml" zcml:condition="installed Products.Five" />
+    <include file="browser-zope3.zcml" zcml:condition="not-installed Products.Five" />
+  </configure>
 
   <page
       name="zodbbrowser_macros"

diff --git a/src/zodbbrowser/standalone.py b/src/zodbbrowser/standalone.py
@@ -36,7 +36,7 @@ class Options(object):
     server_type = 'WSGI-HTTP'
     verbose = True
     threads = 4
-    features = ('zserver',) # maybe 'devmode' too?
+    features = ('zserver', 'standalone-zodbbrowser') # maybe 'devmode' too?
     site_definition = """
         <configure xmlns="http://namespaces.zope.org/zope"
                    i18n_domain="zodbbrowser">