Some bugfixes in datahandlers

lodel/leapi/datahandlers/base_classes.py

@@ -193,7 +193,8 @@ class Reference(DataHandler):
     # @param **kwargs : other arguments
     def __init__(self, allowed_classes = None, back_reference = None, internal=False, **kwargs):
         self.__allowed_classes = set() if allowed_classes is None else set(allowed_classes)
-        self._linked_classes = list() if allowed_classes is None else allowed_classes
+        self.allowed_classes = list() if allowed_classes is None else 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)

lodel/leapi/datahandlers/datas.py

@@ -66,7 +66,6 @@ class UniqID(Integer):
 
     help = 'Fieldtype designed to handle editorial model UID'
     base_type = 'int'
-    cast_type = int
 
     ##@brief A uid field
     # @param **kwargs

lodel/leapi/datahandlers/datas_base.py

@@ -30,6 +30,7 @@ class Integer(DataField):
 
     help = 'Basic integer field'
     base_type = 'int'
+    cast_type = int
 
     def __init__(self, **kwargs):
         super().__init__( **kwargs)

lodel/leapi/datahandlers/references.py

@@ -43,6 +43,7 @@ class List(MultipleRef):
         if isinstance(cur_value, str):
             value = cur_value.split(',')
             l_value = [uidtype.cast_type(uid) for uid in value]
+            #l_value = [int(uid) for uid in value]
 
             return l_value
         elif isinstance(cur_value, list):
@@ -89,6 +90,8 @@ class Set(MultipleRef):
         if isinstance(cur_value, str):
             value = cur_value.split(',')
             l_value = [uidtype.cast_type(uid) for uid in value] 
+            logger.debug("Valeur avec uidtype : %d" % l_value) 
+            #l_value = [int(uid) for uid in value] 
             return list(l_value)
         elif isinstance(cur_value, set):
             l_value = list()

plugins/webui/templates/admin/admin_create.html

@@ -15,6 +15,9 @@
      <p>&nbsp;</p>
  <input type="submit" value="Save">
  </form>
+<div>
+    <a href="object_create">Return</a>
+</div>
 {% endblock %}
 
 

plugins/webui/templates/admin/admin_edit.html

@@ -17,4 +17,7 @@
     {% endfor %}
      <input type="submit" value="Save">
     </form>
+<div>
+    <a href="classes_admin">Return</a>
+</div>
 {% endblock %}

plugins/webui/templates/admin/editable_component.html

@@ -12,13 +12,13 @@
         {% endif %}
         {% if field.directly_editable %}
             <input id="{{fieldname}}" name="field_input_{{fieldname}}" type="text" value="{{sval}}" >
-            {% set l_classe = field._linked_classes %}
+            {% set l_classe = field.l_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 %}
 	{% else %}
-		Unsupported base type "{{field.base_type}}" </br>
+		Unsupported base type "{{field.base_type}}" <br>
 	{% endif %}
 {%- endmacro %}

plugins/webui/templates/admin/list_classes_admin.html

@@ -11,4 +11,7 @@
     <li> <a href="class_admin?classname={{ classe.__name__ }}" target="_blank">{{ classe.__name__ }} </a>{{ abst }}</li>
     {% endfor %}
 </ul>
+<div>
+    <a href="../admin/">Return</a>
+</div>
 {% endblock %}

plugins/webui/templates/admin/list_classes_create.html

@@ -10,4 +10,7 @@
     {% endif %}
     {% endfor %}
 </ul>
+<div>
+    <a href="../admin/">Return</a>
+</div>
 {% endblock %}

plugins/webui/templates/listing/show_object.html

@@ -14,15 +14,18 @@
     
 <ul>
     <!-- To get a component HTML code, it is necessary to call : components.<macro_name>(args) -->
-    {% for fieldname, fieldvalue in obj.fields().items() %}
+    {% for fieldname, fieldvalue in obj.fields(include_ro = True).items() %}
         {% if fieldvalue is not none %}
            {% if fieldvalue.base_type == 'ref' %}
                 {% if obj.data(fieldname) is iterable %}
                     <li>{{ fieldname }}
+                    {% set l_classe = fieldvalue.allowed_classes[0] %}
                         <ul>
                     {% for rel in obj.data(fieldname) %}
-                            {% set l_classe = fieldvalue.linked_classes %}
-                            <li><a href="show_object?classname={{ l_classe.__name__ }}&lodel_id={{ rel|int }}" target="_blank">{{ rel|int }}</a></li>
+                            <!-- Uid for linked_classes is casted to int....not good...but for a while.... -->
+                            {% set casttype = l_classe.data_handler(l_classe.uid_fieldname()[0]).cast_type %}
+                            {% set rel2 = casttype(rel) %}
+                            <li><a href="show_object?classname={{ l_classe.__name__ }}&lodel_id={{ rel2 }}" target="_blank">{{ rel2 }}</a></li>
                     {% endfor %}
                         </ul></li>
                 {% endif %}