Changeset 761

Show
Ignore:
Timestamp:
01/17/07 07:53:16
Author:
chervol
Message:

Merged revisions 754-758,760 via svnmerge from
http://svn/products/qSEOptimizer/branches/js-statistics

........

r754 | piv | 2007-01-15 18:39:37 +0200 (Mon, 15 Jan 2007) | 2 lines


copied from trunk
........
r755 | piv | 2007-01-15 18:46:55 +0200 (Mon, 15 Jan 2007) | 2 lines


added word statistics support on seo properties form
........
r757 | piv | 2007-01-16 19:07:06 +0200 (Tue, 16 Jan 2007) | 3 lines


added tests
........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • qSEOptimizer/trunk

    • Property svnmerge-integrated changed from /qSEOptimizer/branches/js-statistics:1-753 to /qSEOptimizer/branches/js-statistics:1-760

  • qSEOptimizer/trunk/Extensions/Install.py

    r760 r761  
    88from Products.CMFCore.CMFCorePermissions import ManagePortal 
    99from OFS.ObjectManager import BadRequestException 
     10 
     11from Products.CMFPlone.migrations.migration_util import safeEditProperty 
     12from Products.qSEOptimizer.config import * 
    1013 
    1114configlets = ({'id':'qSEOptimizer', 
    …… 
    2730    True = 1 
    2831    False = 0 
     32 
     33def addPropertySheet(self, out): 
     34    """ Add seo_properties property sheet to portal_properties and some needed field to it """ 
     35    portal_props = getToolByName(self, 'portal_properties') 
     36    if not hasattr(portal_props, PROPERTY_SHEET): 
     37        portal_props.addPropertySheet(PROPERTY_SHEET, SHEET_TITLE) 
     38        out.write('Added %s property sheet to portal_properties\n' % PROPERTY_SHEET) 
     39    else: 
     40        out.write('Skipped adding %s property sheet to portal_properties\n' % PROPERTY_SHEET) 
     41    sheet = getattr(portal_props, PROPERTY_SHEET) 
     42    if not hasattr(sheet, 'stop_words'): 
     43        safeEditProperty(sheet, 'stop_words', STOP_WORDS, 'lines') 
     44        out.write('Added \'stop_words\' property field to %s property sheet\n' % PROPERTY_SHEET) 
     45    else: 
     46        out.write('Skipped adding \'stop_words\' property field to %s property sheet\n' % PROPERTY_SHEET) 
     47    if not hasattr(sheet, 'fields'): 
     48        safeEditProperty(sheet, 'fields', FIELDS, 'lines') 
     49        out.write('Added \'fields\' property field to %s property sheet\n' % PROPERTY_SHEET) 
     50    else: 
     51        out.write('Skipped adding \'fields\' property field to %s property sheet\n' % PROPERTY_SHEET) 
    2952 
    3053def setupSkin(self, out, layers): 
    …… 
    106129            props._setProperty('exposeDCMetaTags', True, 'boolean') 
    107130 
     131    addPropertySheet(self, out) 
     132 
    108133    Layers.append('qSEOptimizer') 
    109134    out.write('  Searching for %s... ' % versioned_skin) 

  • qSEOptimizer/trunk/skins/qSEOptimizer/qseo_properties_edit_form.cpt

    r760 r761  
    77    <tal:border define="dummy python:request.set('enable_border',1)" /> 
    88  </metal:border> 
    9  
     9  <metal:javascript_head fill-slot="javascript_head_slot"> 
     10      <script type="text/javascript" 
     11              tal:condition="python:exists('portal/statistics.js')" 
     12              tal:attributes="src string:$portal_url/statistics.js"> 
     13      </script> 
     14  </metal:javascript_head> 
    1015  <body> 
    1116 

  • qSEOptimizer/trunk/tests/testQSEOptimizer.py

    r760 r761  
    1313from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager 
    1414import re 
     15 
     16from Products.qSEOptimizer.config import * 
     17 
     18props = {'stop_words':STOP_WORDS, 'fields':FIELDS} 
    1519 
    1620configlets = ({'id':'qSEOptimizer', 
    …… 
    3539 
    3640    def afterSetUp(self): 
     41        self.properties = getToolByName(self.portal, 'portal_properties') 
    3742        self.qi = self.portal.portal_quickinstaller 
    3843        self.qi.installProduct(PRODUCT) 
     44 
     45    def testAddingPropertySheet(self): 
     46        """ Test adding property sheet to portal_properties tool """ 
     47        self.failUnless(hasattr(self.properties.aq_base, PROPERTY_SHEET)) 
     48 
     49    def testAddingPropertyFields(self): 
     50        """ Test adding property field to portal_properties.maps_properties sheet """ 
     51        map_sheet = self.properties[PROPERTY_SHEET] 
     52        for key, value in props.items(): 
     53            self.failUnless(map_sheet.hasProperty(key) and list(map_sheet.getProperty(key)) == value) 
    3954 
    4055    def test_configlet_install(self): 

  • qSEOptimizer/trunk/version.txt

    r760 r761  
    1 0.4.1 
     10.5-pre