Changeset 531

Timestamp:

09/22/06 09:20:35

Author:

crchemist

Message:

Add possibility to notify user in rejection or approving his reply.

Files:

• qPloneComments/branches/plone-2.5/Extensions/Install.py (modified) (3 diffs)
• qPloneComments/branches/plone-2.5/config.py (modified) (1 diff)
• qPloneComments/branches/plone-2.5/patch.py (modified) (2 diffs)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_publish_comment.py (modified) (2 diffs)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_reply.cpy (modified) (3 diffs)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_reply_form.cpt (modified) (1 diff)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/notify_comment_template.pt (modified) (2 diffs)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_comments_setup.cpy (modified) (1 diff)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_comments_setup_form.cpt (modified) (7 diffs)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_recent_comments_delete.cpy (modified) (2 diffs)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_recent_comments_publish.cpy (modified) (2 diffs)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/rejected_comment_template.pt (modified) (2 diffs)
• qPloneComments/branches/plone-2.5/skins/qplonecomments/reply_notify_template.pt (modified) (1 diff)
• qPloneComments/branches/plone-2.5/utils.py (modified) (2 diffs)

qPloneComments/branches/plone-2.5/Extensions/Install.py

@@ -9 +9 @@
-
-import string
-try:
-    True
-except:
-    True = 1
-    False = 0
-
-def setupSkin(self, out, layers):
@@ -68 +63 @@
-        out.write("Adding %s property sheet to portal_properies\n" % 'qPloneComments' )
-    props_sheet = pp['qPloneComments']
-
-
-
-
-
-
-
+
-    # Tern on Anonymous commenting
-    self.manage_permission(ReplyToItem, ['Anonymous','Manager','Member'], 1)
@@ -120 +109 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-def uninstall(self) :

qPloneComments/branches/plone-2.5/config.py

@@ -8 +8 @@
-CONFIGLET_NAME = "qPloneComments setup"
-
+PROPERTIES = (('enable_approve_user_notification', 'True', 'boolean'),
+              ('enable_reply_user_notification', 'True', 'boolean'),
+              ('enable_rejected_user_notification', 'True', 'boolean'),
+              ('enable_moderation', 'True', 'boolean'),
+              ('require_email', 'False', 'boolean'),
+              ('enable_anonymous_commenting', 'True', 'boolean'),
+              ('enable_published_notification', 'True', 'boolean'),
+              ('enable_approve_notification', 'True', 'boolean'),
+              ('email_discussion_manager', '', 'string'),
+              ('email_subject_prefix', '', 'string'))

qPloneComments/branches/plone-2.5/patch.py

@@ -10 +10 @@
-# Patching createReply method of 
-# Products.CMFDefault.DiscussionItem.DiscussionItemContainer
- 
+, email=''
-    """
-        Create a reply in the proper place
@@ -31 +31 @@
-
-    pm = getToolByName(self, 'portal_membership')
-
+
-    if pm.isAnonymousUser():
-
-
-
+
-    else:
-
+
+
+
+
-
-    item.review_state="private"

qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_publish_comment.py

@@ -10 +10 @@
-from Products.CMFPlone import transaction_note
-from Products.CMFCore.utils import getToolByName
-send_email
+
-
-if obj is None:
@@ -25 +25 @@
-publishDiscussion(reply)
-
-send_notification_message = send_email(reply, container, state="published")
-
-portal_status_message='Comment+successfully+published'

qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_reply.cpy

@@ -11 +11 @@
-from Products.PythonScripts.standard import url_quote_plus
-from Products.CMFCore.utils import getToolByName
-send_email
+manage_mails
-from Products.CMFPlone import PloneMessageFactory as _
-mtool = getToolByName(context, 'portal_membership')
-dtool = getToolByName(context, 'portal_discussion')
+
-req = context.REQUEST
-pp = getToolByName(context,'portal_properties')
-# Get properties
-
-
+
+
+
-if username or password:
-    # The user username/password inputs on on the comment form were used,
@@ -60 +62 @@
-        comment_creator = member.getUserName()
-tb = dtool.getDiscussionFor(context)
-
+
+
+
+
+
+
+
+
+
+
-reply = tb.getReply(id)
-
@@ -68 +79 @@
-
-parent = tb.aq_parent
-
-send_notification_message = send_email(reply, context, state="approve"
+  
+manage_mails(reply, context, 'aproving'
-if not ifModerate:
-send_notification_message += send_email(reply, context, state="published"
+manage_mails(reply, context, 'publishing'
-
-# return to the discussable object.

qPloneComments/branches/plone-2.5/skins/qplonecomments/2.5/discussion_reply_form.cpt

@@ -109 +109 @@
-                    </div>
-                </div>
+
+                <div class="field"
+                     tal:define="property_id string:require_email;
+                                 props_sheet here/portal_properties/qPloneComments"
+                     tal:condition="python:props_sheet.getProperty(property_id) and isAnon">
+
+                    <label for="user_email" i18n:translate="label_discussion-manager_email">Please enter your email:</label>
+                    <span class="fieldRequired" title="Required"
+                          i18n:attributes="title title_required;"
+                          i18n:translate="label_required">(Required)
+                    </span>
+              <div tal:content="string:">Validation error output</div>
+
+                    <input name="user_email"
+                           value=""
+                           size="40"
+                           tabindex=""
+                           tal:attributes="tabindex tabindex/next;" />
+              </div>
-            </div>
-

qPloneComments/branches/plone-2.5/skins/qplonecomments/notify_comment_template.pt

@@ -3 +3 @@
-     tal:define="charset here/portal_properties/site_properties/default_charset|string:utf-8;
-                 dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;;charset=%s' % charset);
-
+
+
->To: <tal:x replace="options/mto"/>
-From: <tal:x replace="options/mfrom"/>
@@ -9 +10 @@
-
-<tal:x replace="options/name"/>,
-
-
-
+
+
-
---

qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_comments_setup.cpy

@@ -10 +10 @@
-from Products.CMFCore.utils import getToolByName
-from Products.qPloneComments.utils import setAnonymCommenting
-
+
-form = context.REQUEST.form
-pp = getToolByName(context, 'portal_properties')

qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_comments_setup_form.cpt

@@ -33 +33 @@
-    <!-- End of tabs -->
-    <div class="documentContent" metal:define-slot="prefs_content">
-qPlone
+Plone 
-
-        <a href=""
@@ -74 +74 @@
-
-                <div class="field"
-anonym_
-isRequireAnonym
-
-
-
-
-isRequireAnonym
-isRequireAnonym
-
-
-isRequireAnonym
-isRequireAnonym
+
+require
+
+
+
+
+require
+require
+
+
+require
+require
-                                           tabindex tabindex/next;"/>
-
-                    <label i18n:translate="label_require_anonym_email" 
-isRequireAnonym
+require
-
-                </div>
@@ -110 +110 @@
-                    <label i18n:translate="label_anonymous_commenting" 
-                           for="isEnabledAnonymousCommenting">Enable anonymous comenting.</label>
-                    
-                </div>
-
-                <div class="field"
-                     tal:define="property_id string:enable_published_notification;
-                                 isEnabledPublishedNotification python:props_sheet.getProperty(property_id, False);"
-                     tal:condition="python:props_sheet.hasProperty(property_id)">
-
-                    <input type="checkbox" 
-                           class="noborder"
-                           name="isEnabledPublishedNotification"
-                           id="isEnabledPublishedNotification"
-                           tabindex =""
-                           tal:attributes="name property_id;
-                                           value isEnabledPublishedNotification;
-                                           checked python:test(isEnabledPublishedNotification, 'True', '');
-                                           tabindex tabindex/next;"/>
-
-                    <label i18n:translate="label_enable_published_notification" 
-                           for="isEnabledPublishedNotification">Enable Document Owner notification on new comments.</label>
-                </div>
-
-                <div class="field"
-                     tal:define="property_id string:enable_approve_notification;
-                                 isEnableApproveNotification python:props_sheet.getProperty(property_id, False);"
-                     tal:condition="python:props_sheet.hasProperty(property_id)">
-
-                    <input type="checkbox" 
-                           class="noborder"
-                           name="isEnableApproveNotification"
-                           id="isEnableApproveNotification"
-                           tabindex =""
-                           tal:attributes="name property_id;
-                                           value isEnableApproveNotification;
-                                           checked python:test(isEnableApproveNotification, 'True', '');
-                                           tabindex tabindex/next;"/>
-
-                    <label i18n:translate="label_enable_approve_notification"
-                           for="isEnableApproveNotification">Enable Discussion Manager notification on new comments.</label>
-                </div>
-
@@ -160 +121 @@
-                           tabindex =""
-                           tal:attributes="value isEnabledManagerModeration;
-               
+                
-                                           tabindex tabindex/next;"/>
-
@@ -180 +141 @@
-                        The e-mail address where notifications about adding new comments will be sent.
-                    </div>
-
+
-                    <div tal:content="error">Validation error output</div>
-
@@ -196 +157 @@
-                                 organization_name python:props_sheet.getProperty(property_id, '');"
-                     tal:condition="python:props_sheet.hasProperty(property_id)">
-
+
-                    <label i18n:translate="label_organization_name">Email subject prefix (organization name)</label>
-
+
-                    <div class="formHelp" id="organization_name_help"
-                         i18n:translate="help_organization_name">
-                        You can change notification message templates customizing 'approve_comment_template' and 'published_comment_template' from qplonecomments skin.
-                    </div>
-
+
-                    <input name="organization_name"
-                           value=""
@@ -213 +174 @@
-                </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </form>
-    </div>

qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_recent_comments_delete.cpy

@@ -10 +10 @@
-
-from Products.CMFCore.utils import getToolByName
+from Products.qPloneComments.utils import manage_mails
-portal_discussion = getToolByName(context, "portal_discussion")
-portal_catalog = getToolByName(context, "portal_catalog")
@@ -25 +26 @@
-        talkback = parent = comment.aq_parent
-
-
+
+
+
-
-psm = comment_ids and 'Comments was successfully deleted.' or 'Please select items to be processed.'

qPloneComments/branches/plone-2.5/skins/qplonecomments/prefs_recent_comments_publish.cpy

@@ -8 +8 @@
-##title=
-##
-
-from Products.CMFCore.utils import getToolByName
-send_email
+manage_mails
-
-request = context.REQUEST
@@ -20 +19 @@
-    comment = portal_catalog(id=comment_id,portal_type='Discussion Item')[0].getObject()
-    publishDiscussion(comment)
-send_notification_message = send_email(comment, container, state="published"
+manage_mails(comment, container, action='publishing'
-
-psm = comment_ids and 'Comments was successfully published.' or 'Please select items to be processed.'

qPloneComments/branches/plone-2.5/skins/qplonecomments/rejected_comment_template.pt

@@ -3 +3 @@
-     tal:define="charset here/portal_properties/site_properties/default_charset|string:utf-8;
-                 dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;;charset=%s' % charset);
-
+
+
->To: <tal:x replace="options/mto"/>
-From: <tal:x replace="options/mfrom"/>
@@ -10 +11 @@
-<tal:x replace="options/name"/>,
-
-'<a href="" tal:attributes="href obj/absolute_url" tal:content="obj/Title"/>'
-email
+<tal:x tal:replace="obj/absolute_url"/>
+mfrom
-
---

qPloneComments/branches/plone-2.5/skins/qplonecomments/reply_notify_template.pt

@@ -3 +3 @@
-     tal:define="charset here/portal_properties/site_properties/default_charset|string:utf-8;
-                 dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;;charset=%s' % charset);
-
+
+
->To: <tal:x replace="options/mto"/>
-From: <tal:x replace="options/mfrom"/>
-<tal:x condition="organization_name" replace="string:[$organization_name] "/>New comment awaits moderation
+Someone replied to your comment on '<tal:x replace="obj/Title"/>'
-
-define="obj nocall:options/obj">
-
-
-
+replace="options/name"/>,
+
+
+
-
---

qPloneComments/branches/plone-2.5/utils.py

@@ -9 +9 @@
-        result =  getattr(config_ps, prop_name, marker)
-    return result
-
-
-# Send notification e-mail on Discussion_Reply 
-# Possible values for state: ["approve", "published"]
-def send_email(reply, context, state="approve"):
-    # Check is notification active
-    notify = False
-    if state=="approve":
-        notify = getProp(context, "enable_approve_notification", False)
-    elif state=="published":
-        notify = getProp(context, "enable_published_notification", False)
-    if not notify:
-        return 0
-
-    # Get parent object
-    parent = reply.inReplyTo()
-    mt = parent.meta_type
-    while mt == 'Discussion Item':
-        try:
-           parent = parent.inReplyTo()
-           mt = parent.meta_type
-        except:
-           break
-
-    # Get portal admin e-mail
-    portal = getToolByName(context, 'portal_url').getPortalObject()
-    from_address = portal.getProperty('email_from_address')
-
-    # Get email address based on state
-    to_address = None
-    if state=="published":
-        creator_id = parent.Creator()
-        if creator_id:
-            mtool = getToolByName(context, 'portal_membership')
-            creator = mtool.getMemberById(creator_id)
-            if creator:
-                to_address = creator.getProperty('email', None)
-    elif state=="approve":
-        to_address = getProp(context, "email_discussion_manager", None)
-
-    # Combine and send email
-    if to_address:
-        if state=="published":
-            template = getattr(context, 'published_comment_template')
-        elif state=="approve":
-            template = getattr(context, 'approve_comment_template')
-
-        organization_name = getProp(context, "email_subject_prefix", "")
-        message = template(obj=parent, mto=to_address,
-                           mfrom=from_address, organization_name=organization_name)
-        try:
-            host = context.MailHost
-            host.send( message )
-        except:
-            return 0
-    return 1
-
-
-def publishDiscussion(self):
@@ -82 +25 @@
-        portal.manage_permission('Reply to item', ['Manager','Member'], 1)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+