Interface

lodel/leapi/datahandlers/base_classes.py

@@ -264,7 +264,8 @@ class MultipleRef(Reference):
         
     def _check_data_value(self, value):
         expt = None
-        if isinstance(str, value):
+     
+        if isinstance(value, str):
             value, expt = super()._check_data_value(value)
         elif not hasattr(value, '__iter__'):
             return None, FieldValidationError("MultipleRef has to be an iterable or a string")

lodel/leapi/datahandlers/references.py

@@ -21,34 +21,39 @@ class List(MultipleRef):
     # @param value *
     # @return tuple(value, exception)
     def _check_data_value(self, value):
-        if isinstance(value, list) or isintance(value, str):
+        if isinstance(value, list) or isinstance(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)
+        #if not isinstance(expt, Exception):
+        #    val = list(val)
+
         return val, expt
 
     def construct_data(self, emcomponent, fname, datas, cur_value):
+        if cur_value == 'None' or cur_value is None or cur_value == '':
+            return None
         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 
-        
+        uidtype = emcomponent.field(u_fname[0]) if isinstance(u_fname, list) else emcomponent.field(u_fname)
+
         if isinstance(cur_value, str):
             value = cur_value.split(',')
-            l_value = [uidtype(uid) for uid in value]
+            l_value = [int(uid) for uid in value] ## à remplacer par uidtype
+            logger.debug(l_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__))
+                    raise ValueError("The items must be of the same type, string or %s" % (ecomponent.__name__))
             return l_value
         else:
             return None
@@ -67,10 +72,38 @@ class Set(MultipleRef):
     # @param value *
     # @return tuple(value, exception)
     def _check_data_value(self, value):
-        val, expt = super()._check_data_value(value)
-        if not isinstance(expt, Exception):
-            val = tuple(set(val))
+        if isinstance(value, set) or isinstance(value, str):
+            val, expt = super()._check_data_value(value)
+        else:
+            return None, FieldValidationError("Set or string expected for a set field")
         return val, expt
+    
+    def construct_data(self, emcomponent, fname, datas, cur_value):
+        if cur_value == 'None' or cur_value is None or cur_value == '':
+            return None
+        emcomponent_fields = emcomponent.fields()
+        data_handler = None
+        if fname in emcomponent_fields:
+            data_handler = emcomponent_fields[fname]
+        u_fname = emcomponent.uid_fieldname()
+        uidtype = emcomponent.field(u_fname[0]) if isinstance(u_fname, list) else emcomponent.field(u_fname)
+        if isinstance(cur_value, str):
+            value = cur_value.split(',')
+            l_value = [int(uid) for uid in value] ## à remplacer par uidtype
+            return list(l_value)
+        elif isinstance(cur_value, set):
+            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" % (ecomponent.__name__))
+            return l_value
+            logger.debug(l_value)
+        else:
+            return None
 
 
 ##@brief Child class of MultipleRef where references are represented in the form of a python dict
@@ -108,7 +141,35 @@ class Hierarch(MultipleRef):
                             **kwargs)
 
     def _check_data_value(self, value):
-        value, expt = super()._check_data_value(value)
-        if isinstance(expt, Exception):
-            return None, expt
-        # determine depth with datasource
+        if isinstance(value, list) or isinstance(value, str):
+            val, expt = super()._check_data_value(value)
+        else:
+            return None, FieldValidationError("Set or string expected for a set field")
+        return val, expt
+    
+    def construct_data(self, emcomponent, fname, datas, cur_value):
+        if cur_value == 'None' or cur_value is None or cur_value == '':
+            return None
+        emcomponent_fields = emcomponent.fields()
+        data_handler = None
+        if fname in emcomponent_fields:
+            data_handler = emcomponent_fields[fname]
+        u_fname = emcomponent.uid_fieldname()
+        uidtype = emcomponent.field(u_fname[0]) if isinstance(u_fname, list) else emcomponent.field(u_fname)
+        if isinstance(cur_value, str):
+            value = cur_value.split(',')
+            l_value = [int(uid) for uid in value] ## à remplacer par uidtype
+            return list(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" % (ecomponent.__name__))
+            return l_value
+            logger.debug(l_value)
+        else:
+            return None

lodel/leapi/leobject.py

@@ -517,6 +517,9 @@ DS_PLUGIN_NAME.DS_INSTANCE_NAME. But got %s" % ds_identifier)
         for name, value in [ (name, value) for name, value in datas.items() if name in correct ]:
             dh = cls._fields[name]
             res = dh.check_data_value(value)
+            logger.debug(name)
+            logger.debug(value)
+            logger.debug(res)
             checked_datas[name], err = res
             if err:
                 err_l[name] = err

plugins/webui/interface/controllers/admin.py

@@ -31,6 +31,8 @@ def admin_update(request):
         for in_put, in_value in request.form.items():
             if in_put != 'classname' and  in_put != 'uid':
                 fields[in_put[12:]] = in_value
+            elif in_put == 'classname':
+                fields['classname'] = in_value
         obj = (target_leo.get(('lodel_id = %s' % (uid))))[0]
         inserted = obj.update(fields)
         
@@ -116,6 +118,9 @@ def admin_create(request):
 def admin_classes(request):
     return get_response('admin/list_classes_admin.html', my_classes = dyncode.dynclasses)
 
+def create_object(request):
+    return get_response('admin/list_classes_create.html', my_classes = dyncode.dynclasses)
+    
 def admin_class(request):
     if 'classname' in request.GET:
         classname = request.GET['classname']

plugins/webui/interface/urls.py

@@ -7,6 +7,7 @@ urls = (
     (r'^/admin/create$', admin_create),
     (r'^/admin/update$', admin_update),
     (r'^/admin/classes_admin$', admin_classes),
+    (r'^/admin/object_create', create_object),
     (r'^/admin/class_admin$', admin_class),
     (r'/test/(?P<id>.*)$', test),
     (r'^/test/?$', test),

plugins/webui/templates/admin/admin.html

@@ -4,7 +4,8 @@
 <h1>{{settings.sitename}} administration</h1>
 {{url('admin')}}
 <ul>
-    <li><a href="classes_admin">List of Classes</a></li>
+    <li><a href="classes_admin">Edit object</a></li>
+    <li><a href="object_create">Create object</a></li>
 </ul>
 
 {% endblock %}

plugins/webui/templates/admin/admin_edit.html

@@ -7,9 +7,9 @@
 {% if msg is not none %}
 {% block msg %} <p style="color:red; font-size:20pt; font-weight:bold">{{ msg }}</p> {% endblock %}
 {% endif %}
-<h1>Lodel 2 - Edit Object {{ lodel_id }} of {{ target.__name__ }}</h1>
+<h1>Lodel 2 - Edit {{ target.__name__ }} with uid {{ lodel_id }} </h1>
     <form action="" method ="post">
-    <input type="hidden" name="uid" value="{{ lodel_id}}" >
+    <input type="hidden" name="uid" value="{{ lodel_id}}" />
     <input type="hidden" name="classname" value={{ target.__name__ }} />
     {% for fieldname, fieldvalue in obj.fields().items() %}
        <div style="padding-bottom:15px;"> {{edit.input(fieldname, fieldvalue, obj.data(fieldname)) }} </div>

plugins/webui/templates/admin/editable_component.html

@@ -4,8 +4,15 @@
 		<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}}" />
-        
-        
+    {% elif field.base_type == 'ref' %}
+        {% if value is iterable %}
+        {% set sval=value|join(',') %}
+        {% else %}
+        {% set sval = value %}
+        {% endif %}
+        <input id="{{fieldname}}" name="field_input_{{fieldname}}" type="text" value="{{sval}}" />
+        {% set l_classe = field.allowed_classes %}
+        <p> Please enter uids to instances of {{ l_classe.__name__ }} separated by comma </p>
 	{% else %}
 		Unsupported base type "{{field.base_type}}" </br>
 	{% endif %}

plugins/webui/templates/listing/show_object.html

@@ -4,14 +4,13 @@
 {% set objects = my_class.get(('lodel_id = %s') % (lodel_id)) %}
 {% set obj = objects.pop() %}
 {% if my_class.is_abstract() %}
-{{ obj.classname}}
-{% set classname = obj.classname %}
+{% set classname = obj.data('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 {{ lodel_id }} of the class {{ classname }}</h1>
+<h1>Lodel 2 - {{ classname }} with uid {{ lodel_id }}</h1>
     
 <ul>
     <!-- To get a component HTML code, it is necessary to call : components.<macro_name>(args) -->