X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmetadata.py;h=04f8511f12aa6d08141a656b4faee717a39ef374;hb=4c7212bd04ddb65511c42aac5bae6fc3044cd846;hp=59d600b17dd42e4f485891eff3ea5b1a31a07edd;hpb=d0ac1170425c64337c521b673b88d75425b8adba;p=myslice.git

diff --git a/manifold/metadata.py b/manifold/metadata.py
index 59d600b1..04f8511f 100644
--- a/manifold/metadata.py
+++ b/manifold/metadata.py
@@ -32,11 +32,18 @@ class MetaData:
                   'column.resource_type', 'column.value_type',
                   'column.allowed_values', 'column.platforms.platform',
                   'column.platforms.platform_url']
-        rows_result = manifold_api.Get({
+        result = manifold_api.Get({
             'object': 'local:object', # proposed to replace metadata:table
             'fields':     fields 
         })
-        rows = rows_result.ok_value()
+
+        if result['code'] == 1: # warning
+            messages.warning(request, result['description'])
+        elif result['code'] == 2:
+            messages.error(request, result['description'])
+            # XXX FAIL HERE XXX
+
+        rows = result.ok_value()
 # API errors will be handled by the outer logic
 #        if not rows:
 #            print "Failed to retrieve metadata",rows_result.error()
@@ -54,4 +61,8 @@ class MetaData:
         return self.hash_by_object[object]
 
     def sorted_fields_by_object (self, object):
-        return self.hash_by_object[object]['columns'].sort()
+        return self.hash_by_object[object]['column'].sort()
+
+    def get_field_type(self, object, field):
+        print "Temp fix for metadata::get_field_type() -> consider moving to manifold.core.metadata soon"
+        return field