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:
		
						commit
						d46ca5e651
					
				@ -4,6 +4,13 @@ Changelog
 | 
				
			|||||||
2.2.1 (unreleased)
 | 
					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'
 | 
					- For migrations of comments without a valid old_status, apply the 'published'
 | 
				
			||||||
  state.
 | 
					  state.
 | 
				
			||||||
  [thet]
 | 
					  [thet]
 | 
				
			||||||
 | 
				
			|||||||
@ -44,14 +44,14 @@
 | 
				
			|||||||
                               tal:attributes="href author_home_url">
 | 
					                               tal:attributes="href author_home_url">
 | 
				
			||||||
                         <img src="defaultUser.gif"
 | 
					                         <img src="defaultUser.gif"
 | 
				
			||||||
                              alt=""
 | 
					                              alt=""
 | 
				
			||||||
                              border="0"
 | 
					                              class="defaultuserimg"
 | 
				
			||||||
                              height="32"
 | 
					                              height="32"
 | 
				
			||||||
                              tal:attributes="src portrait_url;
 | 
					                              tal:attributes="src portrait_url;
 | 
				
			||||||
                                              alt reply/author_name" />
 | 
					                                              alt reply/author_name" />
 | 
				
			||||||
                    </a>
 | 
					                    </a>
 | 
				
			||||||
                    <img src="defaultUser.gif"
 | 
					                    <img src="defaultUser.gif"
 | 
				
			||||||
                         alt=""
 | 
					                         alt=""
 | 
				
			||||||
                         border="0"
 | 
					                         class="defaultuserimg"
 | 
				
			||||||
                         height="32"
 | 
					                         height="32"
 | 
				
			||||||
                         tal:condition="not: has_author_link"
 | 
					                         tal:condition="not: has_author_link"
 | 
				
			||||||
                         tal:attributes="src portrait_url;
 | 
					                         tal:attributes="src portrait_url;
 | 
				
			||||||
 | 
				
			|||||||
@ -108,6 +108,9 @@
 | 
				
			|||||||
.replyTreeLevel10 {
 | 
					.replyTreeLevel10 {
 | 
				
			||||||
    margin-left: 10em;
 | 
					    margin-left: 10em;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					.defaultuserimg {
 | 
				
			||||||
 | 
					    border: 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Reply Form
 | 
					/* Reply Form
 | 
				
			||||||
 | 
				
			|||||||
@ -41,6 +41,8 @@ from Products.CMFCore.CMFCatalogAware import CatalogAware
 | 
				
			|||||||
from Products.CMFCore.CMFCatalogAware import WorkflowAware
 | 
					from Products.CMFCore.CMFCatalogAware import WorkflowAware
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from OFS.role import RoleManager
 | 
					from OFS.role import RoleManager
 | 
				
			||||||
 | 
					from AccessControl import ClassSecurityInfo
 | 
				
			||||||
 | 
					from Products.CMFCore import permissions
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COMMENT_TITLE = _(
 | 
					COMMENT_TITLE = _(
 | 
				
			||||||
@ -78,6 +80,7 @@ class Comment(CatalogAware, WorkflowAware, DynamicType, Traversable,
 | 
				
			|||||||
    """
 | 
					    """
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    implements(IComment)
 | 
					    implements(IComment)
 | 
				
			||||||
 | 
					    security = ClassSecurityInfo()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    meta_type = portal_type = 'Discussion Item'
 | 
					    meta_type = portal_type = 'Discussion Item'
 | 
				
			||||||
    # This needs to be kept in sync with types/Discussion_Item.xml title
 | 
					    # 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
 | 
					        return self.creator
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    security.declareProtected(permissions.View, 'Type')
 | 
				
			||||||
    def Type(self):
 | 
					    def Type(self):
 | 
				
			||||||
        """The Discussion Item content type.
 | 
					        """The Discussion Item content type.
 | 
				
			||||||
        """
 | 
					        """
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user