[Collective-checkins] r230708 - in Products.TinyMCE/trunk: . Products/TinyMCE/adapters

[Laurence R. <svn...@pl...>]

Author: ldr
Date: Wed Jan 19 14:37:04 2011
New Revision: 230708

Modified:
   Products.TinyMCE/trunk/CHANGES.txt
   Products.TinyMCE/trunk/Products/TinyMCE/adapters/JSONFolderListing.py
Log:
Handle Missing.Value for uid in JSONFolderListing.

Modified: Products.TinyMCE/trunk/CHANGES.txt
==============================================================================
--- Products.TinyMCE/trunk/CHANGES.txt	(original)
+++ Products.TinyMCE/trunk/CHANGES.txt	Wed Jan 19 14:37:04 2011
@@ -5,6 +5,9 @@
 1.2.1 (unreleased)
 ------------------
 
+- Handle Missing.Value for uid in JSONFolderListing.
+  [elro]
+
 - Set text/css content type on tinymce-getstyle.
   [elro]
 

Modified: Products.TinyMCE/trunk/Products/TinyMCE/adapters/JSONFolderListing.py
==============================================================================
--- Products.TinyMCE/trunk/Products/TinyMCE/adapters/JSONFolderListing.py	(original)
+++ Products.TinyMCE/trunk/Products/TinyMCE/adapters/JSONFolderListing.py	Wed Jan 19 14:37:04 2011
@@ -81,7 +81,7 @@
         for brain in portal_catalog(portal_type=filter_portal_types, sort_on='getObjPositionInParent', path={'query': path, 'depth':1}):
             catalog_results.append({
                 'id': brain.getId,
-                'uid': brain.UID,
+                'uid': brain.UID or None, # Maybe Missing.Value
                 'url': brain.getURL(),
                 'portal_type': brain.portal_type,
                 'normalized_type': normalizer.normalize(brain.portal_type),