Merge branch 'master' into delete-own-comments

Conflicts: CHANGES.rst
2015-01-29 21:14:05 +01:00
parent 06b20b8f81 0591f9ad2d
commit c852609111
20 changed files with 355 additions and 237 deletions
@@ -14,7 +14,7 @@


 <body>
-<div id="content"
+<article id="content"
     tal:attributes="class view/settings"
     metal:fill-slot="prefs_configlet_content">

@@ -99,6 +99,6 @@
        </div>
    </div>

-</div>
+</article>
 </body>
 </html>
@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
-
-from Acquisition import aq_base, aq_inner
-
+from zope.component import getUtility
 from Products.CMFCore.utils import getToolByName
-
 from Products.CMFCore.interfaces._content import IDiscussionResponse
+from Products.CMFPlone.interfaces.controlpanel import IMailSchema

 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile

@@ -157,12 +155,11 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
    def mailhost_warning(self):
        """Returns true if mailhost is not configured properly.
        """
-        # Copied from plone.app.controlpanel/plone/app/controlpanel/overview.py
-        mailhost = getToolByName(aq_inner(self.context), 'MailHost', None)
-        if mailhost is None:
-            return True
-        mailhost = getattr(aq_base(mailhost), 'smtp_host', None)
-        email = getattr(aq_inner(self.context), 'email_from_address', None)
+        # Copied from Products.CMFPlone/controlpanel/browser/overview.py
+        registry = getUtility(IRegistry)
+        mail_settings = registry.forInterface(IMailSchema, prefix='plone')
+        mailhost = mail_settings.smtp_host
+        email = mail_settings.email_from_address
        if mailhost and email:
            return False
        return True
@@ -182,7 +179,7 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
    def unmigrated_comments_warning(self):
        """Returns true if site contains unmigrated comments.
        """
-        catalog = getToolByName(aq_inner(self.context), 'portal_catalog', None)
+        catalog = getToolByName(self.context, 'portal_catalog', None)
        count_comments_old = catalog.searchResults(
            object_provides=IDiscussionResponse.__identifier__)
        if count_comments_old:
@@ -48,7 +48,7 @@
        /* Fetch the reply form inside the reply div */
        var reply_form = reply_div.find("form");

-        /* Change the id of the textarea of the reply form 
+        /* Change the id of the textarea of the reply form
         * To avoid conflict later between textareas with same id 'form-widgets-comment-text' while implementing a seperate instance of TinyMCE
         * */
        reply_form.find('#formfield-form-widgets-comment-text').attr('id', 'formfield-form-widgets-new-textarea'+comment_id );