Ignore:
Timestamp:
Nov 5, 2010 2:39:46 PM (14 years ago)
Author:
kroman0
Message:

Merged last fixes from branches/jquery

Location:
quintagroup.plonecomments/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • quintagroup.plonecomments/trunk

    • Property svn:mergeinfo changed from /quintagroup.plonecomments/branches/jquery:2230,2240-2241,2313,2321,2753 to /quintagroup.plonecomments/branches/jquery:2230,2240-2241,2313,2321,2753,2962-2982

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/locales

    • Property svn:mergeinfo changed from /quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales:2079-2087,2230,2240-2241,2313,2321,2753 to /quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/locales:2079-2087,2230,2240-2241,2313,2321,2753,2962-2982

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt

    • Property svn:mergeinfo changed from /quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:2079-2087,2230,2240-2241,2313,2321,2753 to /quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt:2079-2087,2230,2240-2241,2313,2321,2753,2962-2982

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/base.py

    r965 r2983  
    3333    # should be available. This can't happen until after we have loaded 
    3434    # the ZCML. 
     35    if not ptc.PLONE31: 
     36        ztc.installPackage("plone.browserlayer") 
     37    ztc.installPackage(PRODUCT) 
     38    transaction.commit() 
    3539 
    36     ztc.installPackage(PRODUCT) 
    3740 
    3841# The order here is important: We first call the deferred function and then 
    … …  
    4043 
    4144setup_product() 
    42 ptc.setupPloneSite(products=[PRODUCT]) 
     45if not ptc.PLONE31: 
     46    ptc.setupPloneSite(products=["plone.browserlayer", PRODUCT]) 
     47else: 
     48    ptc.setupPloneSite(products=[PRODUCT]) 
    4349 
    4450 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsCommenting.py

    r880 r2983  
    55from zExceptions import Unauthorized 
    66from base import getToolByName, FunctionalTestCase 
    7 from config import * 
     7from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS 
    88 
    99 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsConfiglet.py

    r880 r2983  
    66from AccessControl.SecurityManagement import noSecurityManager 
    77from base import getToolByName, FunctionalTestCase 
    8 from config import * 
     8from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS 
    99 
    1010def addUsers(self): 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsModeration.py

    r880 r2983  
    77from common import * 
    88from base import getToolByName, FunctionalTestCase 
    9 from config import * 
     9from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS 
    1010 
    1111class TestModeration(FunctionalTestCase): 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsNotificationRecipients.py

    r1719 r2983  
    1313from base import getToolByName, FunctionalTestCase 
    1414from common import * 
    15 from config import * 
     15from config import PROPERTY_SHEET 
    1616 
    1717from Products.CMFPlone.tests.utils import MockMailHost 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsPermission.py

    r880 r2983  
    66 
    77from base import getToolByName, TestCase 
    8 from config import * 
     8from config import PERM_NAME 
    99 
    1010 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsReportAbuse.py

    r1201 r2983  
    11from base import getToolByName, TestCase 
    2 from config import * 
    3  
    42from testQPloneCommentsCommenting import TestCommBase 
    53from zExceptions import Unauthorized 
    6  
    7 USERS = {# Common Members 
    8          'admin':{'passw': 'secret_admin', 'roles': ['Manager']}, 
    9          'owner':{'passw': 'secret_owner', 'roles': ['Owner']}, 
    10          'member':{'passw': 'secret_member', 'roles': ['Member']}, 
    11          'reviewer':{'passw': 'secret_reviewer', 'roles': ['Reviewer']}, 
    12          # Members for discussion manager group 
    13          'dm_admin':{'passw': 'secret_dm_admin', 'roles': ['Manager']}, 
    14          'dm_owner':{'passw': 'secret_dm_owner', 'roles': ['Owner']}, 
    15          'dm_member':{'passw': 'secret_dm_member', 'roles': ['Member']}, 
    16          'dm_reviewer':{'passw': 'secret_dm_reviewer', 'roles': ['Reviewer']}, 
    17         } 
    18 COMMON_USERS_IDS = [u for u in USERS.keys() if not u.startswith('dm_')] 
    19 COMMON_USERS_IDS.append('anonym') 
    20 DM_USERS_IDS = [u for u in USERS.keys() if u.startswith('dm_')] 
    214 
    225 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsUninstall.py

    r1633 r2983  
    77from base import getToolByName, TestErase 
    88from config import PRODUCT, PRODUCT_SKIN_NAME, CONFIGLET_ID, PROPERTY_SHEET 
     9from zExceptions import BadRequest 
    910 
    1011 
    … …  
    1516        self.qi = self.portal.portal_quickinstaller 
    1617        self.qi.installProduct(PRODUCT) 
    17         self.qi.uninstallProducts([PRODUCT]) 
     18        try: 
     19            self.qi.uninstallProducts([PRODUCT]) 
     20        except BadRequest: 
     21            pass 
    1822 
    1923    def test_package_uninstall(self): 
Note: See TracChangeset for help on using the changeset viewer.