[Testbot] Plone 5.0 - Python 2.7 - Build # 1789 - Regression! - 1 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1789 - Failure!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/1789/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: Products.TinyMCE
Branch: refs/heads/master
Date: 2014-02-27T16:23:07-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/Products.TinyMCE/commit/05547c48b30d48378a920dc0c32613d5fede5b95

fix for image types

Files changed:
M HISTORY.rst
M Products/TinyMCE/adapters/JSONFolderListing.py
M Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js

diff --git a/HISTORY.rst b/HISTORY.rst
index a45d0fe..bb54a6c 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,6 +5,10 @@ HISTORY
 1.4.0 (unreleased)
 ------------------
 
+- Make sure folderish items can be selected as images if they are listed
+  as image types.
+  [davisagli]
+
 - Reapplied fix for missing popups when zoom is applied in Chrome from pull
   request 29. Credits go to bosim, raekjaer and jaroel for fix
   (close `#13013`__)
diff --git a/Products/TinyMCE/adapters/JSONFolderListing.py b/Products/TinyMCE/adapters/JSONFolderListing.py
index a6f54e7..0e810d9 100644
--- a/Products/TinyMCE/adapters/JSONFolderListing.py
+++ b/Products/TinyMCE/adapters/JSONFolderListing.py
@@ -130,6 +130,7 @@ def getListing(self, filter_portal_types, rooted, document_base_url, upload_type
                 'icon': getIcon(brain),
                 'description': description,
                 'is_folderish': brain.is_folderish,
+                'is_image': brain.portal_type in image_types,
                 })
 
         # add catalog_ressults
diff --git a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
index 8a088fb..11f06a7 100755
--- a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+++ b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
@@ -853,7 +853,7 @@ BrowserDialog.prototype.getFolderListing = function (context_url, method) {
                         case 'listview':
                             if (item.is_folderish) {
                                 folder_html.push('<div class="list item folderish ' + (i % 2 === 0 ? 'even' : 'odd') + '">');
-                                if (self.is_link_plugin === true) {
+                                if (self.is_link_plugin === true || item.is_image) {
                                     jq.merge(folder_html, [
                                         '<input href="' + item.url + '" ',
                                             'type="radio" class="noborder" style="margin: 0; width: 16px" name="internallink" value="',




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 2555 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140228/1e2a9307/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 183984 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140228/1e2a9307/attachment-0003.obj>