Changeset 3510 in products for quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser
- Timestamp:
- Aug 22, 2012 10:22:22 AM (12 years ago)
- Location:
- quintagroup.plonegooglesitemaps/trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
quintagroup.plonegooglesitemaps/trunk
- Property svn:mergeinfo
-
old new 3 3 /quintagroup.plonegooglesitemaps/branches/migratioin_product:2826-2839 4 4 /quintagroup.plonegooglesitemaps/branches/plone4:2549-2553 5 /quintagroup.plonegooglesitemaps/branches/sitemap_date:3481-3509 5 6 /quintagroup.plonegooglesitemaps/branches/test_refactoring:2527-2536
-
- Property svn:mergeinfo
-
quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/commonview.py
r3163 r3510 110 110 fname = fspec and fspec.pop() or "id" 111 111 fengine = queryMultiAdapter((self.context, self.request), 112 interface=IBlackoutFilter, name=fname) 112 interface=IBlackoutFilter, 113 name=fname) 113 114 if fengine: 114 115 objects = list(fengine.filterOut(objects, fargs)) -
quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/configletview.py
r3416 r3510 25 25 """ 26 26 27 sitemaps = Attribute("Returns mapping of sitemap's type to list of " \27 sitemaps = Attribute("Returns mapping of sitemap's type to list of " 28 28 "appropriate objects") 29 hasContentSM = Attribute("Returns boolean about existance of content " \29 hasContentSM = Attribute("Returns boolean about existance of content " 30 30 "sitemap") 31 hasMobileSM = Attribute("Returns boolean about existance of mobile " \31 hasMobileSM = Attribute("Returns boolean about existance of mobile " 32 32 "sitemap") 33 33 hasNewsSM = Attribute("Returns boolean about existance of news sitemap") … … 73 73 self.pps = queryMultiAdapter((self.context, self.request), 74 74 name="plone_portal_state") 75 self.sitemaps = [i.getObject() for i in \75 self.sitemaps = [i.getObject() for i in 76 76 self.tools.catalog()(portal_type='Sitemap')] 77 77 … … 97 97 smlist = sitemaps.setdefault(sm.getSitemapType(), []) 98 98 smlist.append({'url': sm.absolute_url(), 'id': sm.id}) 99 99 100 sitemaps['all'] = sitemaps.setdefault('content', []) + \ 100 sitemaps.setdefault('mobile', []) + \ 101 sitemaps.setdefault('news', []) 101 sitemaps.setdefault('mobile', []) + sitemaps.setdefault('news', []) 102 102 return sitemaps 103 103 … … 128 128 'sm_size': size and splitNum(size) or '', 129 129 'sm_entries': entries and splitNum(entries) or '', 130 }130 } 131 131 132 132 def getSitemapData(self, ob): … … 150 150 portal.manage_delObjects([self.request.id, ]) 151 151 self.request.RESPONSE.redirect( 152 153 152 urlparse.urljoin(self.context.absolute_url, 153 'prefs_gsm_verification')) 154 154 155 155 def getVerificationFiles(self): -
quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/mobilesitemapview.py
r3163 r3510 13 13 14 14 additional_maps = ( 15 ('modification_date', lambda x: DateTime(x.ModificationDate).HTML4()), 15 ('modification_date', 16 lambda x: x.sitemap_date or DateTime(x.ModificationDate).HTML4()), 16 17 ) 17 18 … … 22 23 review_state=self.context.getStates(), 23 24 object_provides=MOBILE_INTERFACES, 24 ) 25 is_default_page=False, 26 ) -
quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/newssitemapview.py
r3163 r3510 21 21 22 22 return ( 23 ('publication_date', lambda x: x.Date and \24 23 ('publication_date', 24 lambda x: x.Date and formatDate(x.Date) or ""), 25 25 ('keywords', lambda x: x.Subject and ', '.join(x.Subject) or ""), 26 26 ('title', lambda x: x.Title or x.getId or x.id), 27 ('name', lambda x: x.Title and \28 27 ('name', lambda x: x.Title and 28 reTrailingParenthtical.sub("", x.Title) or ""), 29 29 ('language', lambda x: x.Language or self.default_language()), 30 30 ('access', lambda x: x.gsm_access or ""), 31 ('genres', lambda x: x.gsm_genres and \32 31 ('genres', lambda x: x.gsm_genres and 32 ", ".join(x.gsm_genres) or ""), 33 33 ('stock', lambda x: x.gsm_stock or ""), 34 34 ) … … 47 47 review_state=self.context.getStates(), 48 48 effective={"query": min_date, 49 "range": "min"} 50 ) 49 "range": "min"}, 50 is_default_page=False 51 ) -
quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/sitemapview.py
r3163 r3510 11 11 12 12 additional_maps = ( 13 ('modification_date', lambda x: DateTime(x.ModificationDate).HTML4()), 13 ('modification_date', 14 lambda x: x.sitemap_date or DateTime(x.ModificationDate).HTML4()), 14 15 ) 15 16 … … 18 19 path=self.search_path, 19 20 portal_type=self.context.getPortalTypes(), 20 review_state=self.context.getStates() 21 ) 21 review_state=self.context.getStates(), 22 is_default_page=False 23 )
Note: See TracChangeset
for help on using the changeset viewer.