Changeset 194

Show
Ignore:
Timestamp:
01/23/06 06:09:00
Author:
mylan
Message:

Removed from page templates and python scripts long-chain call for getting property's value from product's property-sheet

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • qPloneComments/trunk/patch.py

    r193 r194  
    7676    return objects 
    7777 
    78 DiscussionItemContainer.__dict__["createReply"] =  createReply 
    79 DiscussionItemContainer.__dict__["getReplies"] =  getReplies 
     78#DiscussionItemContainer.__dict__["createReply"] =  createReply 
     79#DiscussionItemContainer.__dict__["getReplies"] =  getReplies 
     80DiscussionItemContainer.createReply = createReply 
     81DiscussionItemContainer.getReplies = getReplies 

  • qPloneComments/trunk/skins/qplonecomments/discussion_reply.cpy

    r193 r194  
    99from Products.PythonScripts.standard import url_quote_plus 
    1010from Products.qPloneComments.utils import send_email 
     11from Products.CMFCore.utils import getToolByName 
     12from Products.qPloneComments.config import PROPERTY_SHEET 
    1113 
    1214req = context.REQUEST 
     15pp = getToolByName(context,'portal_properties') 
    1316 
    1417if username or password: 
    …… 
    4144######################################################### 
    4245# Get discussion item (reply) author and creating reply # 
    43 isForAnonymous = context.isForAnonymous() 
     46isForAnonymous = pp[PROPERTY_SHEET].getProperty('Enable_Anonymous_Commenting', None) 
    4447comment_creator = req.get('Creator', None) 
    4548if isForAnonymous and comment_creator: 
    …… 
    7477# Inform user about awaiting moderation 
    7578portal_status_message='Comment successfully added.' 
    76 ifModerate = context.ifModerate() 
     79ifModerate = pp[PROPERTY_SHEET].getProperty('Enable_Moderation', None); 
    7780if ifModerate and reply: 
    7881    portal_status_message='Your comment awaits moderartion.' 

  • qPloneComments/trunk/skins/qplonecomments/discussion_reply_form.cpt

    r193 r194  
    2121          action="talkback" 
    2222          tal:attributes="action string:${here/getId}/${template/getId}" 
    23           tal:define="isForAnonymous here/isForAnonymous"> 
     23          tal:define="isForAnonymous python:here.portal_properties.qPloneComments.getProperty('Enable_Anonymous_Commenting', 0)"> 
    2424        <fieldset> 
    2525            <legend i18n:translate="legend_comment_details">Comment Details</legend> 

  • qPloneComments/trunk/skins/qplonecomments/discussionitem_view.pt

    r193 r194  
    1919 
    2020        <div class="comment" 
    21              tal:define="isPublished here/isDIPublished; 
    22                          ifModerate here/ifModerate;"> 
     21             tal:define="isPublished python:here.review_state=='published'; 
     22                         ifModerate python:here.portal_properties.qPloneComments.getProperty('Enable_Moderation', None);"> 
    2323 
    2424            <h2> 

  • qPloneComments/trunk/skins/qplonecomments/prefs_comments_setup.cpy

    r193 r194  
    1010from Products.qPloneComments.config import PROPERTY_SHEET 
    1111from Products.qPloneComments.utils import setAnonymCommenting 
     12from Products.CMFCore.utils import getToolByName 
    1213 
    1314form = context.REQUEST.form 
    14 pp = context.portal_properties 
     15pp = getToolByName(context, 'portal_properties') 
    1516props_sheet = getattr(pp, PROPERTY_SHEET) 
    1617property_maps=[(m['id'], m['type']) for m in props_sheet.propertyMap() if not m['id']=='title'] 

  • qPloneComments/trunk/skins/qplonecomments/validate_talkback.vpy

    r193 r194  
    1010 
    1111from Products.CMFCore.utils import getToolByName 
     12from Products.qPloneComments.config import PROPERTY_SHEET 
    1213 
    1314if not subject: 
    …… 
    1718    state.setError('body_text', 'Please submit a body.', 'body_required') 
    1819 
    19  
    20 isForAnonymous = context.isForAnonymous() 
     20pp = getToolByName(context, 'portal_properties') 
     21isForAnonymous = pp[PROPERTY_SHEET].getProperty('Enable_Anonymous_Commenting', None) 
    2122if isForAnonymous: 
    2223    pm = getToolByName(context, 'portal_membership') 

  • qPloneComments/trunk/skins/qplonecomments/viewThreadsAtBottom.pt

    r193 r194  
    4949 
    5050                <div class="comment" 
    51                      tal:define="isPublished reply/isDIPublished; 
    52                                  ifModerate here/ifModerate"> 
     51                     tal:define="isPublished python:reply.review_state=='published'; 
     52                                 ifModerate python:here.portal_properties.qPloneComments.getProperty('Enable_Moderation', None);"> 
    5353                    <h3> 
    5454                        <tal:block replace="structure portal/discussionitem_icon.gif"/>