Changeset 134

Show
Ignore:
Timestamp:
12/28/05 12:09:51
Author:
mylan
Message:

Moved utils.py from Extensions/utils.py to root Product's directory.
Moved patch code from init.py to patch.py.
Update all related files.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • qPloneComments/trunk/__init__.py

    r133 r134  
    11from Products.CMFCore.DirectoryView import registerDirectory 
     2from AccessControl import allow_module 
    23 
    3 from Products.CMFCore.CMFCorePermissions import ReplyToItem, View 
    4 from Products.CMFDefault.DiscussionItem import DiscussionItemContainer, DiscussionItem 
    5 from AccessControl import ClassSecurityInfo, getSecurityManager, Unauthorized 
    6 from DateTime import DateTime 
     4import config 
     5import patch 
    76 
    8 from config import * 
    9 from Extensions.utils import * 
     7registerDirectory('skins', config.SKIN_GLOBALS) 
    108 
    11 registerDirectory('skins', SKIN_GLOBALS) 
     9allow_module('Products.qPloneComments.config') 
     10allow_module('Products.qPloneComments.utils') 
    1211 
    13 from AccessControl import allow_module 
    14 allow_module('Products.qPloneComments.config') 
    15 allow_module('Products.qPloneComments.Extensions.utils') 
    16  
    17 # Patching createReply method of  
    18 # Products.CMFDefault.DiscussionItem.DiscussionItemContainer 
    19 def createReply( self, title, text, Creator=None ): 
    20     """ 
    21         Create a reply in the proper place 
    22     """ 
    23     container = self._container 
    24      
    25     id = int(DateTime().timeTime()) 
    26     while self._container.get( str(id), None ) is not None: 
    27         id = id + 1 
    28     id = str( id ) 
    29  
    30     item = DiscussionItem( id, title=title, description=title ) 
    31     item._edit( text_format='structured-text', text=text ) 
    32  
    33     if Creator: 
    34         item.creator = Creator 
    35  
    36     item.__of__( self ).indexObject() 
    37  
    38     item.setReplyTo( self._getDiscussable() ) 
    39  
    40     self._container[ id ] = item 
    41  
    42     # Control of performing moderation 
    43     ifModerate = getProp(self, "Turning_on/off_Moderation", marker=False) 
    44     if ifModerate: 
    45         from zLOG import LOG 
    46         LOG('qPloneComments',777,'createReply','ifModerate=%s \t that''s why Moderation was called' % str(ifModerate) ) 
    47         roles = ['Manager', 'Owner', 'Reviewer'] 
    48         item.manage_permission('View', roles, acquire=0) 
    49  
    50     return id 
    51  
    52  
    53 def getReplies( self ): 
    54     """ 
    55         Return a sequence of the DiscussionResponse objects which are 
    56         associated with this Discussable 
    57     """ 
    58     objects = [] 
    59     a = objects.append 
    60     validate = getSecurityManager().validate 
    61  
    62     result_ids = self._getReplyResults() 
    63     for id in result_ids: 
    64         object = self._container.get( id ).__of__( self )  
    65         try: 
    66             if validate(self, self, id, object): 
    67                 a( object ) 
    68         except Unauthorized: 
    69             pass 
    70  
    71     return objects 
    72  
    73 DiscussionItemContainer.__dict__["createReply"] =  createReply 
    74 DiscussionItemContainer.__dict__["getReplies"] =  getReplies 
  • qPloneComments/trunk/skins/qplonecomments/discussion_publish_comment.py

    r133 r134  
    99## 
    1010from Products.CMFPlone import transaction_note 
    11 from Products.qPloneComments.Extensions.utils import publishDiscussion 
     11from Products.qPloneComments.utils import publishDiscussion 
    1212 
    1313# Publish discussion item 
  • qPloneComments/trunk/skins/qplonecomments/discussion_reply.py

    r133 r134  
    77##parameters=subject,body_text,text_format='plain',username=None,password=None 
    88from Products.PythonScripts.standard import url_quote_plus 
    9 from Products.qPloneComments.Extensions.utils import send_email 
     9from Products.qPloneComments.utils import send_email 
    1010 
    1111req = context.REQUEST 
  • qPloneComments/trunk/skins/qplonecomments/ifModerate.py

    r133 r134  
    88##title= 
    99## 
    10 from Products.qPloneComments.Extensions.utils import getProp 
     10from Products.qPloneComments.utils import getProp 
    1111 
    1212return getProp(context, "Turning_on/off_Moderation", False) 
  • qPloneComments/trunk/skins/qplonecomments/isDIPublished.py

    r133 r134  
    99## 
    1010 
    11 from Products.qPloneComments.Extensions.utils import isPublished 
     11from Products.qPloneComments.utils import isPublished 
    1212 
    1313return isPublished(context) 
  • qPloneComments/trunk/skins/qplonecomments/isForAnonymous.py

    r133 r134  
    88##title= 
    99## 
    10 from Products.qPloneComments.Extensions.utils import getProp 
     10from Products.qPloneComments.utils import getProp 
    1111 
    1212return getProp(context, "Turning_on/off_Anonymous_Commenting", False)