Merge pull request #20 from maartenkling/master

The border attribute is obsolete and add permission to type to fix RSS and comments
This commit is contained in:
Timo Stollenwerk 2012-11-13 02:15:31 -08:00
commit d46ca5e651
4 changed files with 16 additions and 2 deletions

View File

@ -4,6 +4,13 @@ Changelog
2.2.1 (unreleased)
------------------
- fix insufficient privileges when trying to view
the RSS feed of a comment collection
[maartenkling]
- removed inline border=0 and move it to css
[maartenkling]
- For migrations of comments without a valid old_status, apply the 'published'
state.
[thet]

View File

@ -44,14 +44,14 @@
tal:attributes="href author_home_url">
<img src="defaultUser.gif"
alt=""
border="0"
class="defaultuserimg"
height="32"
tal:attributes="src portrait_url;
alt reply/author_name" />
</a>
<img src="defaultUser.gif"
alt=""
border="0"
class="defaultuserimg"
height="32"
tal:condition="not: has_author_link"
tal:attributes="src portrait_url;

View File

@ -108,6 +108,9 @@
.replyTreeLevel10 {
margin-left: 10em;
}
.defaultuserimg {
border: 0;
}
/* Reply Form

View File

@ -41,6 +41,8 @@ from Products.CMFCore.CMFCatalogAware import CatalogAware
from Products.CMFCore.CMFCatalogAware import WorkflowAware
from OFS.role import RoleManager
from AccessControl import ClassSecurityInfo
from Products.CMFCore import permissions
COMMENT_TITLE = _(
@ -78,6 +80,7 @@ class Comment(CatalogAware, WorkflowAware, DynamicType, Traversable,
"""
implements(IComment)
security = ClassSecurityInfo()
meta_type = portal_type = 'Discussion Item'
# This needs to be kept in sync with types/Discussion_Item.xml title
@ -186,6 +189,7 @@ class Comment(CatalogAware, WorkflowAware, DynamicType, Traversable,
"""
return self.creator
security.declareProtected(permissions.View, 'Type')
def Type(self):
"""The Discussion Item content type.
"""