Changeset 2197 in products

Timestamp:

Apr 22, 2010 5:47:25 PM (14 years ago)

Author:

mylan

Message:

Fix markers rendering, correct footer url, caching

Location:

quintagroup.portlet.map/trunk/quintagroup/portlet/map

Files:

• qgmapportlet.pt (modified) (3 diffs)
• qgmapportlet.py (modified) (3 diffs)

quintagroup.portlet.map/trunk/quintagroup/portlet/map/qgmapportlet.pt

@@ -2 +2 @@
 <tal:portlet>
 
-  <dl class="portlet portletMapsPortlet"
-      tal:define="view view/gmapview;">
+  <dl class="portlet portletMapsPortlet">
 
       <dt class="portletHeader">
@@ -13 +12 @@
 
       <dd class="portletItem odd">
-
-        <div class="googleMapView googleMapLocation">
-          <dl metal:use-macro="here/maps_map/macros/markers">
-          </dl>
+        <div class="googleMapView googleMapLocation"
+             tal:define="view view/gmapView;">
+           <dl metal:use-macro="here/maps_map/macros/markers">
+           </dl>
         </div>
 
@@ -28 +27 @@
           <span>
             <a href="#"
-               tal:attributes="href string:${view/collection/absolute_url}/maps_map"
+               tal:attributes="href view/footer_url"
                i18n:domain="quintagroup.portlet.map" i18n:translate="label_full_map">Full Map</a></span>
           <span class="portletBottomRight"></span>

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

@@ -76 +76 @@
         portal_state = getMultiAdapter((context, self.request), name=u'plone_portal_state')
         self.portal = portal_state.portal()
-        self.gmapview = queryMultiAdapter((self.collection, self.request),
+        self.gmapEnView = queryMultiAdapter((self.collection, self.request),
                                           name='maps_googlemaps_enabled_view')
-        #self._data = self.collection
+        self.gmapView = queryMultiAdapter((self.collection, self.request),
+                                          name='maps_googlemaps_view')
 
-    #@ram.cache(render_cachekey)
+    @ram.cache(render_cachekey)
     def render(self):
         return xhtml_compress(self._template())
@@ -86 +87 @@
     @property
     def available(self):
-        return bool(self.gmapview and \
-                    self.gmapview.enabled and \
-                    self.gmapview.getMarkers())
+        return bool(self.gmapEnView and self.gmapView and \
+                    self.gmapEnView.enabled and \
+                    self._data())
 
     @property
@@ -96 +97 @@
         except:
             return None
+
+    @property
+    def footer_url(self):
+        collection_url = self.collection and self.collection.absolute_url()
+        return collection_url and collection_url + '/maps_map' or ''
+
+    @memoize
+    def _data(self):
+        if hasattr(self.collection, 'queryCatalog'):
+            return self.collection.queryCatalog()
+        return []
+