Merge pull request #25 from BB-Open/fix_None_display

Fixed 'None' displayed for the Description in ajaxselectWidget

src/pkan/dcatapde/content/base.py

@@ -65,3 +65,21 @@ def title_from_title_field(self):
             except KeyError:
                 continue
         return title
+
+    def desc_from_desc_field(self):
+        desc = None
+        struct = IStructure(self)
+        for desc_field in struct.desc_field:
+            try:
+                all_descs = getattr(self, desc_field)
+                if not all_descs:
+                    continue
+                if isinstance(all_descs, dict):
+                    desc = unicode(all_descs.items()[0][1])
+                elif isinstance(all_descs, list):
+                        desc = unicode(all_descs[0])
+                else:
+                    desc = unicode(all_descs)
+            except KeyError:
+                continue
+        return desc

src/pkan/dcatapde/content/dcat_catalog.py

@@ -195,7 +195,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
 
 class DCATCatalogDefaultFactory(DexterityFactory):

src/pkan/dcatapde/content/dcat_dataset.py

@@ -258,7 +258,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
 
 class DCATDatasetDefaultFactory(DexterityFactory):

src/pkan/dcatapde/content/dcat_distribution.py

@@ -148,7 +148,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
 
 class DCATDistributionDefaultFactory(DexterityFactory):

src/pkan/dcatapde/content/dct_licensedocument.py

@@ -57,7 +57,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
     def title_for_vocabulary(self):
         """Return a title suitable for vocabulary terms."""

src/pkan/dcatapde/content/dct_location.py

@@ -52,7 +52,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
     def title_for_vocabulary(self):
         """Return a title suitable for vocabulary terms."""

src/pkan/dcatapde/content/dct_mediatypeorextent.py

@@ -54,7 +54,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
 
 class DCTMediaTypeOrExtentDefaultFactory(DexterityFactory):

src/pkan/dcatapde/content/dct_rightsstatement.py

@@ -57,7 +57,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
     def title_for_vocabulary(self):
         """Return a title suitable for vocabulary terms."""

src/pkan/dcatapde/content/dct_standard.py

@@ -52,7 +52,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
     def title_for_vocabulary(self):
         """Return a title suitable for vocabulary terms."""

src/pkan/dcatapde/content/foaf_agent.py

@@ -54,7 +54,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
 
 class FOAFAgentDefaultFactory(DexterityFactory):

src/pkan/dcatapde/content/rdfs_literal.py

@@ -41,6 +41,9 @@ class RDFLiteral(Item, DCATMixin):
     def Title(self):
         return self.title_from_title_field()
 
+    def Description(self):
+        return self.desc_from_desc_field()
+
 
 def literal2plone(literal, field=None):
     val = literal.toPython()

src/pkan/dcatapde/content/skos_concept.py

@@ -59,7 +59,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
 
 class SKOSConceptDefaultFactory(DexterityFactory):

src/pkan/dcatapde/content/skos_conceptscheme.py

@@ -51,7 +51,7 @@ def Title(self):
         return self.title_from_title_field()
 
     def Description(self):
-        return unicode(self.dct_description)
+        return self.desc_from_desc_field()
 
 
 class SKOSConceptSchemeDefaultFactory(DexterityFactory):

src/pkan/dcatapde/harvesting/source_type/rdf.py

@@ -668,6 +668,18 @@ def create_dx_obj(
             )
             return brains[0].getObject()
 
+        # Handle not given descriptions to prevent u'None' brains
+        desc_found = False
+        for desc_field in struct.desc_field:
+            if desc_field in obj_data:
+                desc_found = True
+                break
+
+        if not desc_found:
+            for desc_field in struct.desc_field:
+                obj_data[desc_field] = None
+            obj_data['description'] = None
+
         # Create an instance of the node as dexterity object
         try:
             obj = content.create(

src/pkan/dcatapde/structure/structure.py

@@ -130,6 +130,7 @@ class StructBase(object):
     portal_type = None
     # List of fields that can act as title for dx object creation
     title_field = ['dct_title']
+    desc_field = ['dct_description']
 
     # caching
     _fields_in_order = None