Changeset 230

Show
Ignore:
Timestamp:
02/01/06 06:09:55
Author:
mylan
Message:

Clean code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • qPloneComments/branches/plone-2.1/Extensions/Install.py

    r229 r230  
    4545    # add Property sheet to portal_properies 
    4646    pp = getToolByName(self, 'portal_properties') 
    47     if not PROPERTY_SHEET in pp.objectIds(): 
    48         pp.addPropertySheet(id=PROPERTY_SHEET, title= '%s Properties' % PROPERTY_SHEET) 
    49         out.write("Adding %s property sheet to portal_properies\n" % PROPERTY_SHEET ) 
    50     props_sheet = pp[PROPERTY_SHEET] 
    51     updateProperty(props_sheet, id="Enable_Moderation", value="True", property_type='boolean', out=out) 
    52     updateProperty(props_sheet, id="Enable_Anonymous_Commenting", value="True", property_type='boolean', out=out) 
    53     updateProperty(props_sheet, id="Enable_Published_Notification", value="True", property_type='boolean', out=out) 
    54     updateProperty(props_sheet, id="Enable_Approve_Notification", value="True", property_type='boolean', out=out) 
    55     updateProperty(props_sheet, id="Email_Discussion_Manager", value="", property_type='string', out=out) 
    56     updateProperty(props_sheet, id="Email_Subject_Prefix", value="", property_type='string', out=out) 
     47    if not 'qPloneComments' in pp.objectIds(): 
     48        pp.addPropertySheet(id='qPloneComments', title= '%s Properties' % 'qPloneComments') 
     49        out.write("Adding %s property sheet to portal_properies\n" % 'qPloneComments' ) 
     50    props_sheet = pp['qPloneComments'] 
     51    updateProperty(props_sheet, id="enable_moderation", value="True", property_type='boolean', out=out) 
     52    updateProperty(props_sheet, id="enable_anonymous_commenting", value="True", property_type='boolean', out=out) 
     53    updateProperty(props_sheet, id="enable_published_notification", value="True", property_type='boolean', out=out) 
     54    updateProperty(props_sheet, id="enable_approve_notification", value="True", property_type='boolean', out=out) 
     55    updateProperty(props_sheet, id="email_discussion_manager", value="", property_type='string', out=out) 
     56    updateProperty(props_sheet, id="email_subject_prefix", value="", property_type='string', out=out) 
    5757    # Tern on Anonymous commenting 
    5858    self.manage_permission(ReplyToItem, ['Anonymous','Manager','Member'], 1) 
    5959 
    60     out.write("Updating properties of %s property sheet\n" % PROPERTY_SHEET ) 
     60    out.write("Updating properties of %s property sheet\n" % 'qPloneComments' ) 
    6161 
    6262    # Add Configlet. Delete old version before adding, if exist one. 
    …… 
    8888    if not pp_ps.hasProperty(id): 
    8989        pp_ps.manage_addProperty(id, value, property_type) 
    90         out.write("Adding %s property to %s property sheet\n" % (id, PROPERTY_SHEET) ) 
     90        out.write("Adding %s property to %s property sheet\n" % (id, 'qPloneComments') ) 
    9191 
    9292 
    …… 
    106106    # Remove Product's property sheet from portal_properties 
    107107    pp = getToolByName(self, 'portal_properties') 
    108     if PROPERTY_SHEET in pp.objectIds(): 
    109         pp.manage_delObjects(ids=[PROPERTY_SHEET,]) 
     108    if 'qPloneComments' in pp.objectIds(): 
     109        pp.manage_delObjects(ids=['qPloneComments',]) 

  • qPloneComments/branches/plone-2.1/config.py

    r229 r230  
    44SKINS_DIR = "skins" 
    55SKIN_NAME = "qplonecomments" 
    6 PROPERTY_SHEET = "qPloneComments" 
    76 
    87CONFIGLET_ID = "prefs_comments_setup_form" 

  • qPloneComments/branches/plone-2.1/patch.py

    r229 r230  
    44from Products.CMFCore.utils import getToolByName 
    55 
    6 #from config import * 
    76from utils import * 
    87 
    …… 
    3433    else: 
    3534        item.manage_addProperty(id='isAnon', value=value, type='boolean') 
     35 
    3636    item.review_state="private" 
    3737 
    38     item.__of__( self ).indexObject() 
    39  
    4038    item.setReplyTo( self._getDiscussable() ) 
    41  
    4239    self._container[ id ] = item 
    4340 
    4441    # Control of performing moderation 
    45     ifModerate = getProp(self, "Enable_Moderation", marker=False) 
     42    ifModerate = getProp(self, "enable_moderation", marker=False) 
    4643    if ifModerate: 
    4744        roles = ['DiscussionManager'] 
    4845        item.manage_permission('Delete objects', roles, acquire=1) 
    49         #item.manage_permission('Review portal content', roles, acquire=0) 
    5046        item.manage_permission('View', roles, acquire=0) 
    5147    else: 
    5248        item.review_state = "published" 
    5349        item._p_changed = 1 
    54          
     50 
     51    item.__of__( self ).indexObject()         
    5552    return id 
    5653 

  • qPloneComments/branches/plone-2.1/skins/qplonecomments/discussion_reply.cpy

    r229 r230  
    1212from Products.CMFCore.utils import getToolByName 
    1313from Products.qPloneComments.utils import send_email 
    14 from Products.qPloneComments.config import PROPERTY_SHEET 
    1514 
    1615mtool = getToolByName(context, 'portal_membership') 
    …… 
    1918pp = getToolByName(context,'portal_properties') 
    2019# Get properties 
    21 isForAnonymous = pp[PROPERTY_SHEET].getProperty('Enable_Anonymous_Commenting', None) 
    22 ifModerate = pp[PROPERTY_SHEET].getProperty('Enable_Moderation', None); 
     20isForAnonymous = pp['qPloneComments'].getProperty('enable_anonymous_commenting', None) 
     21ifModerate = pp['qPloneComments'].getProperty('enable_moderation', None); 
    2322 
    2423 
    …… 
    6766reply = tb.getReply(id) 
    6867 
     68 
    6969# TODO THIS NEEDS TO GO AWAY! 
    7070if hasattr(dtool.aq_explicit, 'cookReply'): 

  • qPloneComments/branches/plone-2.1/skins/qplonecomments/discussion_reply_form.cpt

    r229 r230  
    6262          action="talkback" 
    6363          tal:attributes="action string:$here_url/$template_id" 
    64           tal:define="isForAnonymous python:here.portal_properties.qPloneComments.getProperty('Enable_Anonymous_Commenting', 0)"> 
     64          tal:define="isForAnonymous python:here.portal_properties.qPloneComments.getProperty('enable_anonymous_commenting', 0)"> 
    6565 
    6666        <fieldset> 

  • qPloneComments/branches/plone-2.1/skins/qplonecomments/prefs_comments_setup.cpy

    r229 r230  
    88##title= 
    99## 
    10 from Products.qPloneComments.config import PROPERTY_SHEET 
     10from Products.CMFCore.utils import getToolByName 
    1111from Products.qPloneComments.utils import setAnonymCommenting 
    12 from Products.CMFCore.utils import getToolByName 
    1312 
    1413form = context.REQUEST.form 
    1514pp = getToolByName(context, 'portal_properties') 
    16 props_sheet = getattr(pp, PROPERTY_SHEET) 
     15props_sheet = getattr(pp, 'qPloneComments') 
    1716property_maps=[(m['id'], m['type']) for m in props_sheet.propertyMap() if not m['id']=='title'] 
    1817request_ids = form.keys() 
    …… 
    2726 
    2827        # Switch anonymouse commenting 
    29         if id == 'Enable_Anonymous_Commenting': 
     28        if id == 'enable_anonymous_commenting': 
    3029            allow = False 
    3130            if id in request_ids: 

  • qPloneComments/branches/plone-2.1/skins/qplonecomments/prefs_comments_setup_form.cpt

    r229 r230  
    6464              enctype="multipart/form-data" 
    6565              tal:define ="pp here/portal_properties; 
    66                            ps_name python:modules['Products.qPloneComments.config'].PROPERTY_SHEET; 
    67                            props_sheet python:getattr(pp, ps_name);" 
     66                           props_sheet python:getattr(pp, 'qPloneComments');" 
    6867              tal:attributes="action string:${here/getId}/${template/getId}"> 
    6968 
    …… 
    7271 
    7372                <div class="field" 
    74                      tal:define="property_id string:Enable_Moderation; 
     73                     tal:define="property_id string:enable_moderation; 
    7574                                 isEnabledModeration python:props_sheet.getProperty(property_id, False);" 
    7675                     tal:condition="python:props_sheet.hasProperty(property_id)"> 
    …… 
    9291 
    9392                <div class="field" 
    94                      tal:define="property_id string:Enable_Anonymous_Commenting; 
     93                     tal:define="property_id string:enable_anonymous_commenting; 
    9594                                 isEnabledAnonymousCommenting python:props_sheet.getProperty(property_id, False);" 
    9695                     tal:condition="python:props_sheet.hasProperty(property_id)"> 
    …… 
    112111 
    113112                <div class="field" 
    114                      tal:define="property_id string:Enable_Published_Notification; 
     113                     tal:define="property_id string:enable_published_notification; 
    115114                                 isEnabledPublishedNotification python:props_sheet.getProperty(property_id, False);" 
    116115                     tal:condition="python:props_sheet.hasProperty(property_id)"> 
    …… 
    131130 
    132131                <div class="field" 
    133                      tal:define="property_id string:Enable_Approve_Notification; 
     132                     tal:define="property_id string:enable_approve_notification; 
    134133                                 isEnableApproveNotification python:props_sheet.getProperty(property_id, False);" 
    135134                     tal:condition="python:props_sheet.hasProperty(property_id)"> 
    …… 
    153152                --> 
    154153                    <div class="field" 
    155                          tal:define="property_id string:Email_Discussion_Manager; 
     154                         tal:define="property_id string:email_discussion_manager; 
    156155                                     email python:props_sheet.getProperty(property_id, ''); 
    157156                                     error python:test(errors.has_key(property_id), errors.get(property_id), None);" 
    …… 
    178177 
    179178                    <div class="field" 
    180                          tal:define="property_id string:Email_Subject_Prefix; 
     179                         tal:define="property_id string:email_subject_prefix; 
    181180                                     organization_name python:props_sheet.getProperty(property_id, '');" 
    182181                         tal:condition="python:props_sheet.hasProperty(property_id)"> 

  • qPloneComments/branches/plone-2.1/skins/qplonecomments/validate_setup.vpy

    r229 r230  
    88##parameters= 
    99##title=validates qpc setup 
    10  
     10## 
    1111from Products.CMFCore.utils import getToolByName 
    1212 
    1313form = context.REQUEST.form 
    14 email_key = 'Email_Discussion_Manager' 
     14email_key = 'email_discussion_manager' 
    1515 
    1616if email_key in form: 

  • qPloneComments/branches/plone-2.1/skins/qplonecomments/validate_talkback.vpy

    r229 r230  
    88##parameters=subject='',body_text='' 
    99##title=validates a discussion entry 
    10  
     10## 
    1111from Products.CMFCore.utils import getToolByName 
    12 from Products.qPloneComments.config import PROPERTY_SHEET 
    1312 
    1413dtool = context.portal_discussion 
    …… 
    2726 
    2827pp = getToolByName(context, 'portal_properties') 
    29 isForAnonymous = pp[PROPERTY_SHEET].getProperty('Enable_Anonymous_Commenting', None) 
     28isForAnonymous = pp['qPloneComments'].getProperty('enable_anonymous_commenting', None) 
    3029if isForAnonymous: 
    3130    pm = getToolByName(context, 'portal_membership') 

  • qPloneComments/branches/plone-2.1/skins/qplonecomments/viewThreadsAtBottom.pt

    r229 r230  
    3939 
    4040            <tal:getreplies repeat="reply_dict python:here.getReplyReplies(here)" 
    41                             define="ifModerate python:here.portal_properties.qPloneComments.getProperty('Enable_Moderation', None);"> 
     41                            define="ifModerate python:here.portal_properties.qPloneComments.getProperty('enable_moderation', None);"> 
    4242                <div class="comment" style="" 
    4343                    tal:define="indent python:reply_dict['depth']*2; 

  • qPloneComments/branches/plone-2.1/tests/testQPloneCommentsCommenting.py

    r229 r230  
    166166        pp = getToolByName(self.portal, 'portal_properties') 
    167167        config_ps = getattr(pp, 'qPloneComments', None) 
    168         EnableAnonymComm = getattr(config_ps, "Enable_Anonymous_Commenting") 
     168        EnableAnonymComm = getattr(config_ps, "enable_anonymous_commenting") 
    169169        # Group users depending on Anonymous commenting enabling/disabling 
    170170        if EnableAnonymComm: 
    …… 
    277277        pp = getToolByName(self.portal, 'portal_properties') 
    278278        config_ps = getattr(pp, 'qPloneComments', None) 
    279         EnableAnonymComm = getattr(config_ps, "Enable_Anonymous_Commenting") 
     279        EnableAnonymComm = getattr(config_ps, "enable_anonymous_commenting") 
    280280        # Group users depending on Anonymous commenting enabling/disabling 
    281281        if EnableAnonymComm: 
    …… 
    344344        # Preparation for functional testing 
    345345        # Tern On Moderation and tern on Anonymous commenting  
    346         self.request.form['Enable_Anonymous_Commenting'] = 'True' 
    347         self.request.form['Enable_Moderation'] = 'True' 
     346        self.request.form['enable_anonymous_commenting'] = 'True' 
     347        self.request.form['enable_moderation'] = 'True' 
    348348        self.portal.prefs_comments_setup() 
    349349        # Initialize base classes 
    …… 
    358358        # Preparation for functional testing 
    359359        # Tern On Moderation and tern off Anonymous commenting  
    360         self.request.form['Enable_Moderation'] = 'True' 
     360        self.request.form['enable_moderation'] = 'True' 
    361361        self.portal.prefs_comments_setup() 
    362362        # Initialize base classes 
    …… 
    372372        # Preparation for functional testing 
    373373        # Tern On Anonymous commenting and tern off  Moderation 
    374         self.request.form['Enable_Anonymous_Commenting'] = 'True' 
     374        self.request.form['enable_anonymous_commenting'] = 'True' 
    375375        self.portal.prefs_comments_setup() 
    376376        # Initialize base classes 

  • qPloneComments/branches/plone-2.1/tests/testQPloneCommentsConfiglet.py

    r229 r230  
    7575        self.login('dm') 
    7676        # For prepare mail sending - enter an e-mail adress 
    77         self.prefs._updateProperty('Email_Discussion_Manager', 'discussion.manager@test.com') 
     77        self.prefs._updateProperty('email_discussion_manager', 'discussion.manager@test.com') 
    7878        member = self.portal.portal_membership.getAuthenticatedMember() 
    7979        member.setMemberProperties({'email':'creator@test.com'}) 
    …… 
    9191            return [r['name'] for r in getPortalReplyPerm(ReplyToItem) if r['selected']=='SELECTED'] 
    9292        # Simulate switching ON Anonymous Commenting 
    93         self.request.form['Enable_Anonymous_Commenting'] = 'True' 
     93        self.request.form['enable_anonymous_commenting'] = 'True' 
    9494        self.portal.prefs_comments_setup() 
    9595        actual_reply_permission = getReplyRoles() 
    …… 
    9797                     "'Reply to Item' permission set for %s. 'Anonymous' role NOT added" %  actual_reply_permission) 
    9898        # Simulate switching OFF Anonymous Commenting 
    99         if self.request.form.has_key('Enable_Anonymous_Commenting'): 
    100            del self.request.form['Enable_Anonymous_Commenting'] 
     99        if self.request.form.has_key('enable_anonymous_commenting'): 
     100           del self.request.form['enable_anonymous_commenting'] 
    101101        self.portal.prefs_comments_setup() 
    102102        actual_reply_permission = getReplyRoles() 
    …… 
    108108        addUsers(self) 
    109109        self.discussion = self.portal.portal_discussion 
    110         self.request.form['Enable_Anonymous_Commenting'] = 'True' 
    111         self.request.form['Enable_Moderation'] = 'True' 
     110        self.request.form['enable_anonymous_commenting'] = 'True' 
     111        self.request.form['enable_moderation'] = 'True' 
    112112        self.portal.prefs_comments_setup() 
    113113        # Create talkback for document and Add comment to my_doc 
    …… 
    132132        addUsers(self) 
    133133        self.discussion = self.portal.portal_discussion 
    134         self.request.form['Enable_Anonymous_Commenting'] = 'True' 
     134        self.request.form['enable_anonymous_commenting'] = 'True' 
    135135        self.portal.prefs_comments_setup() 
    136136        # Create talkback for document and Add comment to my_doc 
    …… 
    153153    def testApproveNotification(self): 
    154154        # Check ON Notification Anonymous Commenting 
    155         self.request.form['Enable_Approve_Notification'] = 'True' 
     155        self.request.form['enable_approve_notification'] = 'True' 
    156156        self.portal.prefs_comments_setup() 
    157         self.assert_(self.prefs.getProperty('Enable_Approve_Notification')==1,"Approve Notification not terned ON") 
     157        self.assert_(self.prefs.getProperty('enable_approve_notification')==1,"Approve Notification not terned ON") 
    158158 
    159159        # Check OFF Notification Anonymous Commenting 
    160         if self.request.form.has_key('Enable_Approve_Notification'): 
    161            del self.request.form['Enable_Approve_Notification'] 
     160        if self.request.form.has_key('enable_approve_notification'): 
     161           del self.request.form['enable_approve_notification'] 
    162162        self.portal.prefs_comments_setup() 
    163         self.assert_(self.prefs.getProperty('Enable_Approve_Notification')==0,"Approve Notification not terned OFF") 
     163        self.assert_(self.prefs.getProperty('enable_approve_notification')==0,"Approve Notification not terned OFF") 
    164164 
    165165 
    166166    def testPublishedNotification(self): 
    167167        # Check ON Notification Anonymous Commenting 
    168         self.request.form['Enable_Published_Notification'] = 'True' 
     168        self.request.form['enable_published_notification'] = 'True' 
    169169        self.portal.prefs_comments_setup() 
    170         self.assert_(self.prefs.getProperty('Enable_Published_Notification')==1,"Published Notification not terned ON") 
     170        self.assert_(self.prefs.getProperty('enable_published_notification')==1,"Published Notification not terned ON") 
    171171 
    172172        # Check OFF Notification Anonymous Commenting 
    173         if self.request.form.has_key('Enable_Published_Notification'): 
    174            del self.request.form['Enable_Published_Notification'] 
     173        if self.request.form.has_key('enable_published_notification'): 
     174           del self.request.form['enable_published_notification'] 
    175175        self.portal.prefs_comments_setup() 
    176         self.assert_(self.prefs.getProperty('Enable_Published_Notification')==0,"Published Notification not terned OFF") 
     176        self.assert_(self.prefs.getProperty('enable_published_notification')==0,"Published Notification not terned OFF") 
    177177 
    178178 

  • qPloneComments/branches/plone-2.1/tests/testQPloneCommentsInstall.py

    r229 r230  
    1616CONFIGLET_ID = "prefs_comments_setup_form" 
    1717 
    18 EMAIL_PID = "Email_Discussion_Manager" 
    19 APPROVE_NOTIFICATION_PID = "Enable_Approve_Notification" 
    20 PUBLISHED_NOTIFICATION_PID = "Enable_Published_Notification" 
    21 MODERATION_PID = "Enable_Moderation" 
    22 ANONYMOUS_COMMENTING_PID = "Enable_Anonymous_Commenting" 
     18EMAIL_PID = "email_discussion_manager" 
     19APPROVE_NOTIFICATION_PID = "enable_approve_notification" 
     20PUBLISHED_NOTIFICATION_PID = "enable_published_notification" 
     21MODERATION_PID = "enable_moderation" 
     22ANONYMOUS_COMMENTING_PID = "enable_anonymous_commenting" 
    2323 
    2424PloneTestCase.installProduct(PRODUCT) 

  • qPloneComments/branches/plone-2.1/tests/testQPloneCommentsNotification.py

    r229 r230  
    2424 
    2525    def setApprovePublished(self, swithA=1,swithP=1): 
    26         self.prefs._updateProperty('Enable_Approve_Notification', swithA) 
    27         self.prefs._updateProperty('Enable_Published_Notification', swithP) 
     26        self.prefs._updateProperty('enable_approve_notification', swithA) 
     27        self.prefs._updateProperty('enable_published_notification', swithP) 
    2828 
    2929 
    …… 
    5454        self.login('dm') 
    5555        # For prepare mail sending - enter an e-mail adress 
    56         self.prefs._updateProperty('Email_Discussion_Manager', 'discussion.manager@test.com') 
     56        self.prefs._updateProperty('email_discussion_manager', 'discussion.manager@test.com') 
    5757        member = self.portal.portal_membership.getAuthenticatedMember() 
    5858        member.setMemberProperties({'email':'creator@test.com'}) 
    …… 
    108108 
    109109    def testOFFModerationApprovePublished(self): 
    110         self.prefs._updateProperty('Enable_Moderation', 0) 
     110        self.prefs._updateProperty('enable_moderation', 0) 
    111111 
    112112        # Test Enable Approve Notification & Enable Published Notification 
    …… 
    118118     
    119119    def testOFFModerationApprove(self): 
    120         self.prefs._updateProperty('Enable_Moderation', 0) 
     120        self.prefs._updateProperty('enable_moderation', 0) 
    121121         
    122122        # Test Enable Approve Notification & Disable Published Notification 
    …… 
    128128 
    129129    def testOFFModerationPublished(self):  
    130         self.prefs._updateProperty('Enable_Moderation', 0) 
     130        self.prefs._updateProperty('enable_moderation', 0) 
    131131         
    132132        # Test Enable Published Notification  & Disable Approve Notification 
    …… 
    138138 
    139139    def testOFFModeration(self):  
    140         self.prefs._updateProperty('Enable_Moderation', 0) 
     140        self.prefs._updateProperty('enable_moderation', 0) 
    141141         
    142142        # Test Disable Published Notification & Disable Approve Notification 

  • qPloneComments/branches/plone-2.1/utils.py

    r229 r230  
    11from Products.CMFCore.utils import getToolByName 
    2 from config import * 
    32 
    43# Get apropriate property from (propery_sheeet) configlet 
    …… 
    65    result = marker 
    76    pp = getToolByName(self, 'portal_properties') 
    8     config_ps = getattr(pp, PROPERTY_SHEET, None) 
     7    config_ps = getattr(pp, 'qPloneComments', None) 
    98    if config_ps: 
    109        result =  getattr(config_ps, prop_name, marker) 
    …… 
    1817    notify = False 
    1918    if state=="approve": 
    20         notify = getProp(context, "Enable_Approve_Notification", False) 
     19        notify = getProp(context, "enable_approve_notification", False) 
    2120    elif state=="published": 
    22         notify = getProp(context, "Enable_Published_Notification", False) 
     21        notify = getProp(context, "enable_published_notification", False) 
    2322    if not notify: 
    2423        return 0 
    …… 
    4847                to_address = creator.getProperty('email', None) 
    4948    elif state=="approve": 
    50         to_address = getProp(context, "Email_Discussion_Manager", None) 
     49        to_address = getProp(context, "email_discussion_manager", None) 
    5150 
    5251    # Combine and send email 
    …… 
    5756            template = getattr(context, 'approve_comment_template') 
    5857 
    59         organization_name = getProp(context, "Email_Subject_Prefix", "") 
     58        organization_name = getProp(context, "email_subject_prefix", "") 
    6059        message = template(obj=parent, mto=to_address, 
    6160                           mfrom=from_address, organization_name=organization_name) 
    …… 
    7372    self.manage_permission('View', roles, acquire=1) 
    7473    self._p_changed = 1 
     74    self.reindexObject() 
    7575 
    7676