Changeset 2555 in products


Ignore:
Timestamp:
Jun 18, 2010 9:43:41 AM (9 years ago)
Author:
mylan
Message:

Merged plone4 branch into trunk : revisions 3588-3592 via svnmerge from
http://svn.quintagroup.com/products/quintagroup.plonegooglesitemaps/branches/plone4

........

r3588 | mylan | 2010-06-17 17:57:02 +0300 (Thu, 17 Jun 2010) | 1 line


#130: Fix 'ValueError?: Product factory for Sitemap was invalid' error in tests.

........

r3589 | mylan | 2010-06-17 19:13:57 +0300 (Thu, 17 Jun 2010) | 1 line


#130: updated configlet templates - added plone4 related globals

........

r3590 | mylan | 2010-06-17 20:10:17 +0300 (Thu, 17 Jun 2010) | 1 line


#130: Fixed absence of tabindex in pagetemplates

........

r3591 | mylan | 2010-06-17 20:58:49 +0300 (Thu, 17 Jun 2010) | 1 line


#130: Fixed breakage on testing upgrades

........

r3592 | mylan | 2010-06-17 21:05:56 +0300 (Thu, 17 Jun 2010) | 1 line


#130: Updated history

........

Location:
quintagroup.plonegooglesitemaps/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • quintagroup.plonegooglesitemaps/trunk

    • Property svn:mergeinfo
      •  

        old new  
         1/quintagroup.plonegooglesitemaps/branches/plone4:2549-2553 
        12/quintagroup.plonegooglesitemaps/branches/test_refactoring:2527-2536 
    • Property svnmerge-integrated changed from /quintagroup.plonegooglesitemaps/branches/plone4:1-3587 /quintagroup.plonegooglesitemaps/branches/test_refactoring:1-3576 to /quintagroup.plonegooglesitemaps/branches/test_refactoring:1-3576 /quintagroup.plonegooglesitemaps/branches/plone4:1-3593
  • quintagroup.plonegooglesitemaps/trunk/docs/HISTORY.txt

    r2541 r2555  
    55------------------ 
    66 
    7 * Nothing changed yet 
     7* Make plone4 related upgrades of page templates 
     8  [mylan] 
     9* Some tests updates 
     10  [mylan] 
    811 
    912 
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/skins/plonegooglesitemaps/prefs_gsm_overview.cpt

    r1593 r2555  
    88<body> 
    99  <div metal:fill-slot="prefs_configlet_main" 
    10        tal:define="errors python:request.get('errors', {})"> 
     10       tal:define="errors python:request.get('errors', {}); 
     11                   portal context/@@plone_portal_state/portal;"> 
    1112 
    1213    <div class="documentEditable"> 
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/skins/plonegooglesitemaps/prefs_gsm_settings.cpt

    r1593 r2555  
    77<body> 
    88    <div metal:fill-slot="prefs_configlet_main" 
    9         tal:define="errors python:request.get('errors', {})"> 
     9        tal:define="errors python:request.get('errors', {}); 
     10                    here_url context/@@plone_context_state/object_url; 
     11                    portal context/@@plone_portal_state/portal; 
     12                    Iterator python:modules['Products.CMFPlone'].IndexIterator; 
     13                    tabindex python:Iterator(mainSlot=False);"> 
    1014 
    1115        <div class="documentEditable"> 
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/skins/plonegooglesitemaps/prefs_gsm_verification.cpt

    r2519 r2555  
    88    <div metal:fill-slot="prefs_configlet_main" 
    99        tal:define="errors python:request.get('errors', {}); 
    10                     view here/@@sitemap_settings;"> 
     10                    view here/@@sitemap_settings; 
     11                    here_url context/@@plone_context_state/object_url; 
     12                    portal context/@@plone_portal_state/portal; 
     13                    template_id template/getId;"> 
    1114 
    1215        <div class="documentEditable"> 
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/base.py

    r2538 r2555  
    1717 
    1818from Products.PloneTestCase import PloneTestCase as ptc 
     19from Products.PloneTestCase.layer import onsetup 
    1920from Products.PloneTestCase.layer import PloneSite 
    2021from Products.PloneTestCase.setup import portal_owner 
     
    3031quintagroup.plonegooglesitemaps.config.testing = 1 
    3132quintagroup.plonegooglesitemaps.config.UPDATE_CATALOG = True 
     33 
     34PRODUCT = 'quintagroup.plonegooglesitemaps' 
     35 
     36@onsetup 
     37def setup_product(): 
     38    """Set up the package and its dependencies. 
     39 
     40    The @onsetup decorator causes the execution of this body to be 
     41    deferred until the setup of the Plone site testing layer. We could 
     42    have created our own layer, but this is the easiest way for Plone 
     43    integration tests. 
     44    """ 
     45    fiveconfigure.debug_mode = True 
     46    import quintagroup.plonegooglesitemaps 
     47    zcml.load_config('configure.zcml', quintagroup.plonegooglesitemaps) 
     48    zcml.load_config('overrides.zcml', quintagroup.plonegooglesitemaps) 
     49    fiveconfigure.debug_mode = False 
     50 
     51    ztc.installPackage(PRODUCT) 
     52 
     53setup_product() 
     54ptc.setupPloneSite( products=(PRODUCT,)) 
    3255 
    3356 
     
    6992        self.auth = "%s:%s" % (portal_owner, default_password) 
    7093 
    71 # Initialize all needed zcml directives 
    72 fiveconfigure.debug_mode = True 
    73 from Products import Five, CMFCore, GenericSetup 
    74 zcml.load_config('meta.zcml', Five) 
    75 zcml.load_config('meta.zcml', CMFCore) 
    76 zcml.load_config('meta.zcml', GenericSetup) 
    77 zcml.load_config('permissions.zcml', Five) 
    78  
    79 # Force quintagroup.plonegooglesitemaps zcml initialization 
    80 zcml.load_config('configure.zcml', quintagroup.plonegooglesitemaps) 
    81 zcml.load_config('overrides.zcml', quintagroup.plonegooglesitemaps) 
    82 fiveconfigure.debug_mode = False 
    83  
    84 # Install quintagroup.plonegooglesitemaps package and Plone site 
    85 # with the default profile for the package 
    86 PRODUCT = 'quintagroup.plonegooglesitemaps' 
    87 ptc.installPackage(PRODUCT) 
    88 ptc.setupPloneSite( products=(PRODUCT,)) 
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testUpgrade.py

    r2538 r2555  
    117117        upgrades = _upgrade_registry.getUpgradeStepsForProfile(self.profile) 
    118118        upgrades = dict([(u.sortkey, u) for u in upgrades.values()]) 
     119        orig_ver = self.setup.getLastVersionForProfile(self.profile) 
     120        self.setup.setLastVersionForProfile(self.profile, "") 
    119121        try: 
    120122            # Replace original handlers with patched ones for test calls 
     
    134136            upgrades[2].handler = gsm_upgrades.upgrade_1_1_to_1_2 
    135137            upgrades[3].handler = gsm_upgrades.upgrade_1_2_to_1_3 
     138            self.setup.setLastVersionForProfile(self.profile, orig_ver) 
    136139 
    137140         
Note: See TracChangeset for help on using the changeset viewer.