Changeset 2515 in products

Timestamp:

Jun 11, 2010 8:55:43 AM (14 years ago)

Author:

mylan

Message:

#192: Update configlet view: use standard plone_portal_state, and plone_tools for getting plone's portal and tools

File:

• quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/configletview.py (modified) (3 diffs)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/configletview.py

@@ -5 +5 @@
 from Products.CMFCore.utils import getToolByName
 
+from quintagroup.plonegooglesitemaps.interfaces import ISitemap
 from quintagroup.plonegooglesitemaps import qPloneGoogleSitemapsMessageFactory as _
-from quintagroup.plonegooglesitemaps.interfaces import ISitemap
 
 def splitNum(num):
@@ -54 +54 @@
         self.request = request
 
-        catalog = getToolByName(self.context, 'portal_catalog')
-        self.sitemaps = [i.getObject() for i in catalog(portal_type='Sitemap')]
-
+        self.tools = queryMultiAdapter((self.context, self.request), name="plone_tools")
+        self.pps = queryMultiAdapter((self.context, self.request), name="plone_portal_state")
+        self.sitemaps = [i.getObject() for i in self.tools.catalog()(portal_type='Sitemap')]
 
     @property
@@ -130 +130 @@
     def getVerificationFiles(self):
         vfs = []
-        pp = getToolByName(self.context, 'portal_properties')
-        props = getattr(pp,'googlesitemap_properties')
+        props = getattr(self.tools.properties(),'googlesitemap_properties')
         if props:
-            portal_ids = getToolByName(self.context, 'portal_url').getPortalObject().objectIds()
+            portal_ids = self.pps.portal().objectIds()
             props_vfs = list(props.getProperty('verification_filenames',[]))
             vfs = [vf for vf in props_vfs if vf in portal_ids]