Changeset 401
- Timestamp:
- 07/14/06 10:20:03
- Files:
-
- qPloneComments/branches/plone-2.5/Extensions/Install.py (modified) (1 diff)
- qPloneComments/branches/plone-2.5/tests/helperNotify.py (modified) (previous)
- qPloneComments/branches/plone-2.5/tests/output/mail.res (modified) (previous)
- qPloneComments/branches/plone-2.5/tests/sample/approve.mail (modified) (previous)
- qPloneComments/branches/plone-2.5/tests/sample/published.mail (modified) (previous)
- qPloneComments/branches/plone-2.5/tests/testQPloneCommentsModeration.py (modified) (4 diffs)
- qPloneComments/branches/plone-2.5/tests/testQPloneCommentsNotification.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
qPloneComments/branches/plone-2.5/Extensions/Install.py
r400 r401 87 87 88 88 # Add DiscussionManager role to Portal 89 roles = list(self.__ac_roles__) 90 if not 'DiscussionManager' in roles: 91 if float(plone_version) == 2.5: 92 self.acl_users.addRole('DiscussionManager') 93 else: 94 roles.append( 'DiscussionManager' ) 89 if float(plone_version) == 2.5: 90 uf = getToolByName(self, 'acl_users') 91 rmanager = uf.portal_role_manager 92 existing = rmanager.listRoleIds() 93 if not 'DiscussionManager' in existing: 94 rmanager.addRole('DiscussionManager') 95 out.write("Added DiscussionManager role top portal.\n") 96 elif float(plone_version) < 2.5: 97 roles = list(self.__ac_roles__) 98 if not 'DiscussionManager' in roles: 99 roles.append('DiscussionManager') 95 100 roles = tuple(roles) 96 101 self.__ac_roles__ = roles 97 out.write("Added DiscussionManager role top portal.\n")102 out.write("Added DiscussionManager role top portal.\n") 98 103 99 104 self.manage_permission('Moderate Discussion', ['DiscussionManager', 'Manager']) 100 105 # Add 'DiscussionManagers' group 101 portal_groups = getToolByName(self, 'portal_groups') 102 if not 'DiscussionManager' in portal_groups.listGroupIds(): 103 portal_groups.addGroup('DiscussionManager', roles=['DiscussionManager']) 106 gtool = getToolByName(self, 'portal_groups') 107 existing = gtool.listGroupIds() 108 if not 'DiscussionManager' in existing: 109 gtool.addGroup('DiscussionManager', roles=['DiscussionManager']) 104 110 out.write("Added DiscussionManager group to portal_groups with DiscussionManager role.\n") 105 111 qPloneComments/branches/plone-2.5/tests/testQPloneCommentsModeration.py
r400 r401 130 130 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish"\\s*/>',\ 131 131 re.S|re.M) 132 else: 133 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish This Discussion"\\s*/>',\ 134 re.S|re.M) 132 elif self.version.startswith("2.5"): 133 pattern = re.compile('.*<input.+?value="Publish"',\ 134 re.S|re.M) 135 else: 136 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish This Discussion"\\s*/>',\ 137 re.S|re.M) 138 135 139 roles = [r['name'] for r in self.portal.rolesOfPermission('Moderate Discussion') if r['selected'] == 'SELECTED'] 136 140 authorized_users = [user for user in COMMON_USERS_IDS if user !='anonym'] … … 153 157 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish"\\s*/>',\ 154 158 re.S|re.M) 155 else: 156 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish This Discussion"\\s*/>',\ 159 elif self.version.startswith("2.5"): 160 pattern = re.compile('.*<input.+?value="Publish"',\ 161 re.S|re.M) 162 else: 163 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish This Discussion"\\s*/>',\ 157 164 re.S|re.M) 158 165 for u in DM_USERS_IDS: … … 172 179 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish"\\s*/>',\ 173 180 re.S|re.M) 174 else: 175 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish This Discussion"\\s*/>',\ 181 elif self.version.startswith("2.5"): 182 pattern = re.compile('.*<input.+?value="Publish"',\ 183 re.S|re.M) 184 else: 185 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Publish This Discussion"\\s*/>',\ 176 186 re.S|re.M) 177 187 for u in DM_USERS_IDS: … … 214 224 # Prepare pattern for delete reply button presence checking 215 225 if self.version.startswith("2.1"): 216 pattern = re.compile('.*<input\\s*class="destructive"\\s*type="submit"\\s*value="Remove"\\s*/>',\ 217 re.S|re.M) 218 else: 219 pattern = re.compile('.*<input\\s*class="destructive"\\s*type="submit"\\s*value="Remove This Discussion"\\s*/>',\ 226 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Delete"\\s*/>',\ 227 re.S|re.M) 228 elif self.version.startswith("2.5"): 229 pattern = re.compile('.*<input.+?value="Delete"',\ 230 re.S|re.M) 231 else: 232 pattern = re.compile('.*<input\\s*class="standalone"\\s*type="submit"\\s*value="Delete"\\s*/>',\ 220 233 re.S|re.M) 221 234 for u in COMMON_USERS_IDS: qPloneComments/branches/plone-2.5/tests/testQPloneCommentsNotification.py
r400 r401 105 105 self.my_doc.discussion_reply('Reply 1', 'text of reply') 106 106 testMailSend(self, state='approve') 107 107 108 108 109 109 def testOFFModerationApprovePublished(self): … … 146 146 testNotMailSend(self, state='published') 147 147 148 148 149 149 150 150 TESTS = [TestNotification]
