Changeset 2206 in products

Timestamp:

Apr 26, 2010 7:16:19 PM (14 years ago)

Author:

mylan

Message:

Fix correct JS added when portlet rendering on non IMapsEnabled adaptable context

File:

• quintagroup.portlet.map/trunk/quintagroup/portlet/map/qgmapportlet.py (modified) (5 diffs)

quintagroup.portlet.map/trunk/quintagroup/portlet/map/qgmapportlet.py

@@ +1 @@
+import string
 from zope.interface import implements
 from zope.component import queryMultiAdapter, getMultiAdapter
@@ -61 +62 @@
 
 
+JS_TEMPLATE = string.Template("""
+   <script src="${portal_url}/maps-config.js" type="text/javascript"></script>
+   <script src="${portal_url}/maps-googlemaps.js" type="text/javascript"></script>
+""")
+
 class Renderer(base.Renderer):
     """Portlet renderer.
@@ -76 +82 @@
         portal_state = getMultiAdapter((context, self.request), name=u'plone_portal_state')
         self.portal = portal_state.portal()
+        self.portal_url = portal_state.portal_url()
         self.gmapEnView = queryMultiAdapter((self.collection, self.request),
                                           name='maps_googlemaps_enabled_view')
@@ -81 +88 @@
                                           name='maps_googlemaps_view')
 
+    def render(self):
+        return self.render_js() + self.render_html()
+
     @ram.cache(render_cachekey)
-    def render(self):
+    def render_html(self):
         return xhtml_compress(self._template())
 
@@ -102 +112 @@
         collection_url = self.collection and self.collection.absolute_url()
         return collection_url and collection_url + '/maps_map' or ''
+
+    @memoize
+    def render_js(self):
+        #  JS block included only if it's not already present in html-header block:
+        #  for check use maps_googlemaps_enabled_view view
+        contxtEnView = queryMultiAdapter((self.context, self.request),
+                                         name='maps_googlemaps_enabled_view')
+        if not (contxtEnView and contxtEnView.enabled):
+            return JS_TEMPLATE.substitute({'portal_url':self.portal_url})
+        return ""
 
     @memoize