Merge pull request #1025 from ZeitOnline/ZO-7097-zeitweb-compat

ZO-7097: Do not load zeit.tickaroo by default, only when required for vivi UI
ZeitOnline · Feb 17, 2025 · de00a16 · de00a16
2 parents 613af82 + 3cd6bd9
commit de00a16
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/core/docs/changelog/ZO-7097.change b/core/docs/changelog/ZO-7097.change
@@ -0,0 +1 @@
+ZO-7097: Do not load zeit.tickaroo by default, only when required for vivi UI
diff --git a/core/src/zeit/content/article/ctesting.zcml b/core/src/zeit/content/article/ctesting.zcml
@@ -14,8 +14,7 @@
   <include package="zeit.edit" />
   <include package="zeit.edit.browser" />
 
-  <include package="zeit.content.modules" />
-  <include package="zeit.content.modules.browser" />
+  <include package="zeit.content.modules" file="ctesting.zcml" />
 
   <include package="zeit.content.image" />
   <include package="zeit.content.image.browser" />

diff --git a/core/src/zeit/content/cp/ctesting.zcml b/core/src/zeit/content/cp/ctesting.zcml
@@ -9,6 +9,6 @@
 
   <include package="zeit.content.image" />
   <include package="zeit.content.image.browser" />
-  <include package="zeit.content.modules" />
+  <include package="zeit.content.modules" file="ctesting.zcml" />
 
 </configure>
diff --git a/core/src/zeit/content/modules/configure.zcml b/core/src/zeit/content/modules/configure.zcml
@@ -4,9 +4,6 @@
 
   <grok:grok package="." exclude="browser" />
 
-  <include package="zeit.cmp" />
-  <include package="zeit.tickaroo" />
-
   <class class=".jobticker.Feed">
     <require
       attributes="id title teaser landing_url feed_url"

diff --git a/core/src/zeit/content/modules/ctesting.zcml b/core/src/zeit/content/modules/ctesting.zcml
@@ -0,0 +1,14 @@
+<configure
+   xmlns="http://namespaces.zope.org/zope"
+   xmlns:meta="http://namespaces.zope.org/meta"
+   i18n_domain="zope"
+   >
+
+  <include package="zeit.content.modules" />
+  <include package="zeit.content.modules.browser" />
+
+  <include package="zeit.content.text" />
+  <include package="zeit.tickaroo" />
+  <include package="zeit.wochenmarkt" />
+
+</configure>
diff --git a/core/src/zeit/content/modules/ftesting.zcml b/core/src/zeit/content/modules/ftesting.zcml
@@ -6,10 +6,8 @@
 
   <include package="zeit.cms" file="ftesting.zcml" />
 
-  <include package="zeit.content.modules" />
-  <include package="zeit.content.modules.browser" />
+  <include package="zeit.content.modules" file="ctesting.zcml" />
 
-  <include package="zeit.content.text" />
-  <include package="zeit.wochenmarkt" />
+  <include package="zeit.cmp" />
 
 </configure>
diff --git a/core/src/zeit/content/modules/testing.py b/core/src/zeit/content/modules/testing.py
@@ -4,7 +4,6 @@
 import zeit.cms.content.add
 import zeit.cms.testing
 import zeit.content.modules
-import zeit.content.text.text
 import zeit.wochenmarkt.ingredients
 import zeit.wochenmarkt.testing
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ZO-7097: Do not load zeit.tickaroo by default, only when required for vivi UI