Start handling some back_ref constraints

Updated interface with nex dyncode

lodel/leapi/datahandlers/base_classes.py

@@ -29,7 +29,8 @@ class DataHandler(object):
 
     ##@brief List fields that will be exposed to the construct_data_method
     _construct_datas_deps = []
-
+    
+    directly_editable = True
     ##@brief constructor
     # @param internal False | str : define whether or not a field is internal
     # @param immutable bool : indicates if the fieldtype has to be defined in child classes of LeObject or if it is
@@ -274,6 +275,9 @@ class MultipleRef(Reference):
                 return None, FieldValidationError("Too many items")
         return value, expt
 
+    def check_data_consistency(self, emcomponent, fname, datas):
+        return True
+    
 ## @brief Class designed to handle datas access will fieldtypes are constructing datas
 #
 # This class is designed to allow automatic scheduling of construct_data calls. 

lodel/leapi/datahandlers/references.py

@@ -130,6 +130,7 @@ class Map(MultipleRef):
 ##@brief This Reference class is designed to handler hierarchy with some constraint
 class Hierarch(MultipleRef):
     
+    directly_editable = False
     ##@brief Instanciate a data handler handling hierarchical relation with constraints
     # @param back_reference tuple : Here it is mandatory to have a back ref (like a parent field)
     # @param max_depth int | None :  limit of depth
@@ -170,6 +171,5 @@ class Hierarch(MultipleRef):
                 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

plugins/webui/interface/controllers/listing.py

@@ -3,8 +3,11 @@ from .base import get_response
 import leapi_dyncode as dyncode
 
 def list_classes(request):
-    template_vars = {'my_classes': dyncode.dynclasses}
-    return get_response('listing/list_classes.html', my_classes=dyncode.dynclasses)
+    if 'allclasses' in request.GET:
+        allclasses = request.GET['allclasses']
+    else:
+        allclasses = 1
+    return get_response('listing/list_classes.html', my_classes=dyncode.dynclasses, allclasses = allclasses)
 
 def show_class(request):
     if 'classname' in request.GET:

plugins/webui/interface/urls.py

@@ -6,13 +6,14 @@ urls = (
     (r'^/admin/?$', admin),
     (r'^/admin/create$', admin_create),
     (r'^/admin/update$', admin_update),
-    (r'^/admin/classes_admin$', admin_classes),
+    (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),
     #(r'/show/(?P<id>.*)$', show_document),
     (r'^/list_classes', list_classes),
+    (r'^/list_classes?$', list_classes),
     #(r'^/show_object/(.+)$', show_object),
     (r'^/show_object?$', show_object),
     #(r'^/show_class/(.+)$', show_class),

plugins/webui/templates/admin/editable_component.html

@@ -1,18 +1,23 @@
 {% macro input(fieldname, field, value='') -%}
 	<label for="field_input_{{fieldname}}">{{fieldname}}</label>
 	{% if field.base_type == 'bool' %}
-		<input id="field_input_{{fieldname}}" name="field_input_{{fieldname}}" type="checkbox" checked="{% if value %}checked{% endif %}" />
+		<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}}" />
+		<input id="{{fieldname}}" name="field_input_{{fieldname}}" type="text" value="{{value}}" >
     {% elif field.base_type == 'ref' %}
         {% if value is iterable %}
-        {% set sval=value|join(',') %}
+            {% set sval=value|join(',') %}
         {% else %}
-        {% set sval = value %}
+            {% set sval = value %}
+        {% endif %}
+        {% if field.directly_editable %}
+            <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 commas </p>
+        {% else %}
+            <input id="{{fieldname}}" name="field_input_{{fieldname}}" type="text" value="{{sval}}" readonly >
+            <p> If you want to update this field, please do it in child objects</p>
         {% 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/list_classes.html

@@ -4,13 +4,13 @@
 <h1>Lodel 2 - List of Classes</h1>
 <ul>
 {% for classe in my_classes %}
-    {% set abst = '' %}
-    {% if classe.is_abstract() %}
-    {% set abst = ' - Abstract class ' %}
-    {% else %}
-    {% set abst = ' - ' ~ classe.get(None)|length %}
-    {% endif %}
+    {% if classe.is_abstract() and allclasses == 1 %}
+        {% set abst = ' - Abstract class ' %}
+        <li> <a href="show_class?classname={{ classe.__name__ }}" target="_blank">{{ classe.__name__ }} </a>{{ abst }}</li>
+    {% elif not classe.is_abstract() %}
+        {% set abst = ' - ' ~ classe.get(None)|length %}
     <li> <a href="show_class?classname={{ classe.__name__ }}" target="_blank">{{ classe.__name__ }} </a>{{ abst }}</li>
-    {% endfor %}
+    {% endif %}
+{% endfor %}
 </ul>
 {% endblock %}

plugins/webui/templates/listing/show_class.html

@@ -2,7 +2,7 @@
 {% block title %}Lodel 2 - Class {{ classname }} {% endblock %}
 {% block content %} 
 <h1>Lodel 2 - Class {{ classname }} </h1>
- {% set my_class  = leapi.Object.name2class(classname) %}
+ {% set my_class  = leapi.name2class(classname) %}
  {% if my_class.child_classes()|length >0 %}
      <h2> Childs classes</h2>
      <ul>

plugins/webui/templates/listing/show_object.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% import 'components/components.html' as components %}
-{% set my_class = leapi.Object.name2class(classname) %}
+{% set my_class = leapi.name2class(classname) %}
 {% set objects = my_class.get(('lodel_id = %s') % (lodel_id)) %}
 {% set obj = objects.pop() %}
 {% if my_class.is_abstract() %}