Merge pull request #6 from eea/develop

Develop #153089
eea · Aug 29, 2022 · 02f397f · 02f397f
2 parents de8532e + 470c5a1
commit 02f397f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.4 - (2022-08-29)
+---------------------------
+* Change: Changed how eea.banner gets STATIC/DYNAMIC env vars
+  [iulianpetchesi #153089]
+
 1.3 - (2022-02-17)
 ---------------------------
 * Change: Fix api when addon not installed

diff --git a/eea/banner/restapi/get.py b/eea/banner/restapi/get.py
@@ -5,6 +5,7 @@
 from six.moves import urllib
 from plone import api
 from plone.restapi.services import Service
+from zope.component.hooks import getSite
 from zope.interface import implementer
 from zope.publisher.interfaces import IPublishTraverse
 
@@ -72,20 +73,25 @@ def reply(self):
                 "dynamic_banner": {"enabled": False},
             }
         development = self.request.form.get("development")
+
+        dynamic_banner_env = "DYNAMIC_BANNER_ENABLED_" + getSite().getId()
         dynamic_banner_enabled = isTrue(
-            os.getenv("DYNAMIC_BANNER_ENABLED", False)
+            os.getenv(dynamic_banner_env, False)
         ) or api.portal.get_registry_record(
             "dynamic_banner_enabled",
             interface=IBannerSettings,
             default=False,
         )
+
+        static_banner_env = "STATIC_BANNER_ENABLED_" + getSite().getId()
         static_banner_enabled = isTrue(
-            os.getenv("STATIC_BANNER_ENABLED", False)
+            os.getenv(static_banner_env, False)
         ) or api.portal.get_registry_record(
             "static_banner_enabled",
             interface=IBannerSettings,
             default=False,
         )
+
         return {
             "static_banner": {
                 "enabled": static_banner_enabled,

diff --git a/eea/banner/version.txt b/eea/banner/version.txt
@@ -1 +1 @@
-1.3
+1.4