Gestion des relations

lodel/leapi/datahandlers/base_classes.py

@@ -146,7 +146,7 @@ class DataHandler(object):
     # @param fieldtype_name str : A field type name (not case sensitive)
     # @return DataField child class
     # @todo implements custom handlers fetch
-    # @note To access custom data handlers it can be cool to preffix the handler name by plugin name for example ? (to ensure name unicity)
+    # @note To access custom data handlers it can be cool to prefix the handler name by plugin name for example ? (to ensure name unicity)
     @classmethod
     def from_name(cls, name):
         cls.load_base_handlers()
@@ -192,12 +192,15 @@ class Reference(DataHandler):
     # @param **kwargs : other arguments
     def __init__(self, allowed_classes = None, back_reference = None, internal=False, **kwargs):
         self.__allowed_classes = [] if allowed_classes is None else set(allowed_classes)
+        logger.warning("We're going to inialize an temporary attribute, don't forget to fix this issue")
+        self.allowed_classes = None if allowed_classes is None else allowed_classes.pop() ## WARNING : just here for step over the issue with __allowed_classes
         if back_reference is not None:
             if len(back_reference) != 2:
                 raise ValueError("A tuple (classname, fieldname) expected but got '%s'" % back_reference)
             #if not issubclass(back_reference[0], LeObject) or not isinstance(back_reference[1], str):
             #    raise TypeError("Back reference was expected to be a tuple(<class LeObject>, str) but got : (%s, %s)" % (back_reference[0], back_reference[1]))
         self.__back_reference = back_reference
+
         super().__init__(internal=internal, **kwargs)
     
     @property
@@ -242,7 +245,7 @@ class SingleRef(Reference):
         val, expt = super()._check_data_value(value)
         if not isinstance(expt, Exception):
             if len(val) > 1:
-               return None, FieldValidationError("Only single values are allowed for SingleRef fields")
+                return None, FieldValidationError("Only single values are allowed for SingleRef fields")
         return val, expt
 
 
@@ -260,11 +263,15 @@ class MultipleRef(Reference):
 
         
     def _check_data_value(self, value):
-        value = value.split(',')
+        expt = None
+        if isinstance(str, value):
+            value, expt = super()._check_data_value(value)
+        elif not hasattr(value, '__iter__'):
+            return None, FieldValidationError("MultipleRef has to be an iterable or a string")
         if self.max_item is not None:
             if self.max_item < len(value):
-                return None, FieldValidationError("To many items")
-        return value, None
+                return None, FieldValidationError("Too many items")
+        return value, expt
 
 ## @brief Class designed to handle datas access will fieldtypes are constructing datas
 #

lodel/leapi/datahandlers/references.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from lodel.leapi.datahandlers.base_classes import Reference, MultipleRef, SingleRef, FieldValidationError
 
+from lodel import logger
 
 class Link(SingleRef):
     pass
@@ -20,11 +21,37 @@ class List(MultipleRef):
     # @param value *
     # @return tuple(value, exception)
     def _check_data_value(self, value):
-        val, expt = super()._check_data_value(value)
+        if isinstance(value, list) or isintance(value, str):
+            val, expt = super()._check_data_value(value)
+        else:
+            return None, FieldValidationError("List or string expected for a list field")
         if not isinstance(expt, Exception):
             val = list(val)
         return val, expt
 
+    def construct_data(self, emcomponent, fname, datas, cur_value):
+        emcomponent_fields = emcomponent.fields()
+        data_handler = None
+        if fname in emcomponent_fields:
+            data_handler = emcomponent_fields[fname]
+        u_fname = emcomponent.uid_fieldname()
+        uidtype = u_fname[0] if isinstance(u_fname, tuple) else u_fname 
+        
+        if isinstance(cur_value, str):
+            value = cur_value.split(',')
+            l_value = [uidtype(uid) for uid in value]
+            return l_value
+        elif isinstance(cur_value, list):
+            type_list = str if isinstance(cur_value[0], str) else uidtype
+            l_value = list()
+            for value in cur_value:
+                if isinstance(value,uidtype):
+                    l_value.append(value)
+                else:
+                    raise ValueError("The items must be of the same type, string or %s" % (target.__name__))
+            return l_value
+        else:
+            return None
 
 ##@brief Child class of MultipleRef where references are represented in the form of a python set
 class Set(MultipleRef):

lodel/leapi/leobject.py

@@ -499,7 +499,7 @@ DS_PLUGIN_NAME.DS_INSTANCE_NAME. But got %s" % ds_identifier)
         correct = set() #valid fields name
         mandatory = set() #mandatory fields name
         for fname, datahandler in cls._fields.items():
-            if allow_internal or not datahandler.is_internal():
+            if allow_internal or not datahandler.is_internal() or fname == CLASS_ID_FIELDNAME:
                 correct.add(fname)
                 if complete and not hasattr(datahandler, 'default'):
                     mandatory.add(fname)
@@ -543,7 +543,6 @@ construction and consitency when datas are not complete\n")
         ret_datas = cls.check_datas_value(datas, complete, allow_internal)
         if isinstance(ret_datas, Exception):
             raise ret_datas
-
         if complete:
             ret_datas = cls._construct_datas(ret_datas)
             cls._check_datas_consistency(ret_datas)
@@ -563,6 +562,7 @@ construction and consitency when datas are not complete\n")
                 for fname, ftype in cls._fields.items()
                 if not ftype.is_internal() or ftype.internal != 'autosql'
         }
+        logger.warning(ret)
         return ret
 
     ## @brief Check datas consistency

plugins/webui/interface/controllers/admin.py

@@ -86,6 +86,9 @@ def admin_create(request):
         for in_put, in_value in request.form.items():
             if in_put != 'classname':
                 fields[in_put[12:]] = in_value
+            else:
+                fields[in_put] = in_value
+
         new_uid = target_leo.insert(fields)
         
         if not new_uid is None:

plugins/webui/interface/controllers/listing.py

@@ -4,16 +4,46 @@ import leapi_dyncode as dyncode
 
 def list_classes(request):
     template_vars = {'my_classes': dyncode.dynclasses}
-    return get_response('listing/list_classes.html', tpl_vars=template_vars)
+    return get_response('listing/list_classes.html', my_classes=dyncode.dynclasses)
 
 def show_class(request):
-    template_vars = {
-        'params': request.GET
-    }
-    return get_response('listing/show_class.html', tpl_vars=template_vars)
+    if 'classname' in request.GET:
+        classname = request.GET['classname']
+        if len(classname) > 1:
+            raise HttpException(400)
+        classname = classname[0]
+        try:
+            target_leo = dyncode.Object.name2class(classname)
+        except LeApiError:
+            classname = None
+    return get_response('listing/show_class.html', classname=classname)
 
 def show_object(request):
     template_vars = {
         'params': request.GET
     }
-    return get_response('listing/show_object.html', tpl_vars=template_vars)
+    test_valid = 'lodel_id' in request.GET \
+        and len(request.GET['lodel_id']) == 1
+
+    if test_valid:
+        try:
+            lodel_id = int(request.GET['lodel_id'][0])
+        except (ValueError, TypeError):
+            test_valid = False
+
+    if not test_valid:
+        raise HttpException(400)
+    else:
+        obj = dyncode.Object.get(['lodel_id = %d' % lodel_id])
+        if len(obj) == 0:
+            raise HttpException(404)
+    if 'classname' in request.GET:
+        classname = request.GET['classname']
+        if len(classname) > 1:
+            raise HttpException(400)
+        classname = classname[0]
+        try:
+            target_leo = dyncode.Object.name2class(classname)
+        except LeApiError:
+            classname = None
+    return get_response('listing/show_object.html', lodel_id=lodel_id, classname=classname)

plugins/webui/templates/admin/editable_component.html

@@ -4,6 +4,8 @@
 		<input id="field_input_{{fieldname}}" name="field_input_{{fieldname}}" type="checkbox" checked="{% if value %}checked{% endif %}" />
 	{% elif field.base_type == 'char' or field.base_type == 'int' %}
 		<input id="{{fieldname}}" name="field_input_{{fieldname}}" type="text" value="{{value}}" />
+        
+        
 	{% else %}
 		Unsupported base type "{{field.base_type}}" </br>
 	{% endif %}

plugins/webui/templates/listing/list_classes.html

@@ -10,7 +10,7 @@
     {% else %}
     {% set abst = ' - ' ~ classe.get(None)|length %}
     {% endif %}
-    <li> <a href="show_class?name={{ classe.__name__ }}" target="_blank">{{ classe.__name__ }} </a>{{ abst }}</li>
+    <li> <a href="show_class?classname={{ classe.__name__ }}" target="_blank">{{ classe.__name__ }} </a>{{ abst }}</li>
     {% endfor %}
 </ul>
 {% endblock %}

plugins/webui/templates/listing/show_class.html

@@ -1,9 +1,8 @@
 {% extends "base.html" %}
-{% set my_classname = params['name'].pop() %}
-{% block title %}Lodel 2 - Class {{ my_classname }} {% endblock %}
+{% block title %}Lodel 2 - Class {{ classname }} {% endblock %}
 {% block content %} 
-<h1>Lodel 2 - Class {{ my_classname }} </h1>
- {% set my_class  = leapi.Object.name2class(my_classname) %}
+<h1>Lodel 2 - Class {{ classname }} </h1>
+ {% set my_class  = leapi.Object.name2class(classname) %}
  {% if my_class.child_classes()|length >0 %}
      <h2> Childs classes</h2>
      <ul>
@@ -22,7 +21,7 @@
     {% set objects = my_class.get(None) %}
     <ul>
     {% for obj in objects %}
-        <li><a href="show_object?classe={{ my_classname }}&id={{ obj.uid() }}" target="_blank">{{ obj.uid() }} </a></li>
+        <li><a href="show_object?classname={{ classname }}&lodel_id={{ obj.uid() }}" target="_blank">{{ obj.uid() }} </a></li>
     {% endfor %}
     </ul>
  {% endif %}

plugins/webui/templates/listing/show_object.html

@@ -1,20 +1,35 @@
 {% extends "base.html" %}
 {% import 'components/components.html' as components %}
-{% set my_classname = params['classe'].pop() %}
-{% set my_id = params['id'].pop() %}
-{% set my_class = leapi.Object.name2class(my_classname) %}
-{% set objects = my_class.get(('%s = %s') % ('lodel_id', my_id)) %}
+{% set my_class = leapi.Object.name2class(classname) %}
+{% set objects = my_class.get(('lodel_id = %s') % (lodel_id)) %}
 {% set obj = objects.pop() %}
-{% block title %}Lodel 2 - Object {{ my_id }} {% endblock %}
+{% if my_class.is_abstract() %}
+{{ obj.classname}}
+{% set classname = obj.classname %}
+{% set my_class = my_class.name2class(classname) %}
+{% endif %}
+{% block title %}Lodel 2 - Object {{ lodel_id }} {% endblock %}
 {% import "components/components.html" as components %}
 {% block content %}
-<h1>Lodel 2 - Object {{ my_id }} of the class {{ my_classname }}</h1>
+<h1>Lodel 2 - Object {{ lodel_id }} of the class {{ classname }}</h1>
     
 <ul>
     <!-- To get a component HTML code, it is necessary to call : components.<macro_name>(args) -->
-    {% for fieldname, fieldvalue in obj.datas().items() %}
+    {% for fieldname, fieldvalue in obj.fields().items() %}
         {% if fieldvalue is not none %}
-    <li> {{ fieldname }} : {{ fieldvalue }} </li>
+           {% if fieldvalue.base_type == 'ref' %}
+                {% if obj.data(fieldname) is iterable %}
+                    <li>{{ fieldname }}
+                        <ul>
+                    {% for rel in obj.data(fieldname) %}
+                            {% set l_classe = fieldvalue.allowed_classes %}
+                            <li><a href="show_object?classname={{ l_classe.__name__ }}&lodel_id={{ rel|int }}" target="_blank">{{ rel|int }}</a></li>
+                    {% endfor %}
+                        </ul></li>
+                {% endif %}
+            {% else %}
+                <li> {{ fieldname }} : {{ obj.data(fieldname) }} </li>
+            {% endif %}
         {% endif %}
     {% endfor %}
 </ul>