Changeset 1127

Show
Ignore:
Timestamp:
06/27/08 09:37:47
Author:
deo
Message:

Cleaned up imports. Changed code style.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • qPloneComments/branches/plone-3.0/patch.py

    r1121 r1127  
    1 from Products.CMFDefault.DiscussionItem import DiscussionItemContainer, DiscussionItem 
    2 from AccessControl import getSecurityManager, Unauthorized 
    31from DateTime import DateTime 
     2from Globals import InitializeClass 
     3from AccessControl import Unauthorized 
     4from AccessControl import getSecurityManager 
    45from Products.CMFCore.utils import getToolByName 
    5 from AccessControl import ClassSecurityInfo 
    6 from Globals import InitializeClass 
    7 import rfc822 
    8 from StringIO import StringIO 
    9 from utils import * 
     6from Products.CMFDefault.DiscussionItem import DiscussionItem 
     7from Products.CMFDefault.DiscussionItem import DiscussionItemContainer 
    108 
    11 # Patching createReply method of  
     9from Products.qPloneComments.utils import getProp 
     10 
     11# Patching createReply method of 
    1212# Products.CMFDefault.DiscussionItem.DiscussionItemContainer 
    13 def createReply( self, title, text, Creator=None, email=''): 
    14     """ 
    15         Create a reply in the proper place 
     13def createReply(self, title, text, Creator=None, email=''): 
     14    """Create a reply in the proper place. 
    1615    """ 
    1716    container = self._container 
    1817 
    1918    id = int(DateTime().timeTime()) 
    20     while self._container.get( str(id), None ) is not None: 
    21         id = id +
    22     id = str( id
     19    while self._container.get(str(id), None) is not None: 
     20        id +=
     21    id = str(id
    2322 
    24     item = DiscussionItem( id, title=title, description=title ) 
    25     item.setFormat('structured-text') 
    26     item._edit(text) 
     23    item = DiscussionItem(id, title=title, description=title) 
    2724 
    2825    if Creator: 
    29         if hasattr(item, 'addCreator')
     26        if getattr(item, 'addCreator', None) is not None
    3027            item.addCreator(Creator) 
    3128        else: 
    3229            item.creator = Creator 
    3330 
     31    self._container[id] = item 
     32    item = item.__of__(self) 
     33 
     34    item.setFormat('structured-text') 
     35    item._edit(text) 
     36 
    3437    pm = getToolByName(self, 'portal_membership') 
    35  
    3638    if pm.isAnonymousUser(): 
    3739        item.manage_addProperty(id='email', value=email, type='string') 
    3840 
    39     item.review_state="private" 
    40  
    41     item.setReplyTo( self._getDiscussable() ) 
    42     self._container[ id ] = item 
     41    item.review_state = 'private' 
    4342 
    4443    # Control of performing moderation 
    45     ifModerate = getProp(self, "enable_moderation", marker=False) 
    46     if ifModerate: 
     44    if getProp(self, 'enable_moderation', marker=False): 
    4745        roles = [role['name'] for role in self.acl_users.rolesOfPermission('Moderate Discussion') 
    4846                 if role['selected']== 'SELECTED'] 
     
    5149        item.manage_permission('View', roles, acquire=0) 
    5250    else: 
    53         item.review_state = "published" 
     51        item.review_state = 'published' 
    5452 
    55     item.__of__( self ).indexObject() 
     53    item.setReplyTo(self._getDiscussable()) 
     54    item.indexObject() 
     55 
    5656    return id 
    5757 
    5858def getReplies( self ): 
     59    """Return a sequence of the DiscussionResponse objects which are 
     60       associated with this Discussable. 
    5961    """ 
    60         Return a sequence of the DiscussionResponse objects which are 
    61         associated with this Discussable 
    62     """ 
    63  
    6462    objects = [] 
    65     a = objects.append 
    6663    validate = getSecurityManager().validate 
    6764 
    6865    result_ids = self._getReplyResults() 
    6966    for id in result_ids: 
    70         object = self._container.get( id ).__of__( self
     67        comment = self._container.get(id).__of__(self
    7168        try: 
    72             if validate(self, self, id, object): 
    73                 a( object
     69            if validate(self, self, id, comment): 
     70                objects.append(comment
    7471        except Unauthorized: 
    7572            pass 
     
    8279    funcs = item[1] 
    8380    if 'deleteReply' in funcs: 
    84         new_perms.append( (perm_name, [f for f in funcs if f != 'deleteReply'])
    85         new_perms.append( ('Moderate Discussion', ('deleteReply', ))
     81        new_perms.append((perm_name, [f for f in funcs if f != 'deleteReply'])
     82        new_perms.append(('Moderate Discussion', ('deleteReply',))
    8683    else: 
    8784        new_perms.append(item)