Ignore:
Timestamp:
Aug 22, 2012 10:22:22 AM (12 years ago)
Author:
potar
Message:

Merged sitemap_date branch into trunk

Location:
quintagroup.plonegooglesitemaps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • quintagroup.plonegooglesitemaps/trunk

    • Property svn:mergeinfo

      •  

        old new  
        33/quintagroup.plonegooglesitemaps/branches/migratioin_product:2826-2839 
        44/quintagroup.plonegooglesitemaps/branches/plone4:2549-2553 
         5/quintagroup.plonegooglesitemaps/branches/sitemap_date:3481-3509 
        56/quintagroup.plonegooglesitemaps/branches/test_refactoring:2527-2536 

  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/sitemapview.py

    r3163 r3510  
    1111 
    1212    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()), 
    1415    ) 
    1516 
    … …  
    1819            path=self.search_path, 
    1920            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.