show_object* template factorisation

+ bugfixes in show_object_detailled

lodel/plugins/webui/templates/listing/show_object.html

@@ -1,15 +1,16 @@
 {% extends "base.html" %}
+{% import 'macros/show_object.html' as show_object %}
 {% import 'components/components.html' as components %}
 {% set my_class = leapi.name2class(classname) %}
-{% set uidfield = my_class.uid_fieldname()[0] %}
-{% set objects = my_class.get(('%s = %s') % (uidfield, lodel_id)) %}
-{% set obj = objects.pop() %}
+{% set obj = my_class.get_from_uid(lodel_id) %}
+{% if obj is none %}
+    ERROR <!-- conception failure, the controller should test this before calling the template -->
+{% endif %}
 {% if my_class.is_abstract() %}
 {% set classname = obj.data('classname') %}
 {% set my_class = my_class.name2class(classname) %}
 {% endif %}
 {% block title %}Object {{ lodel_id }} {% endblock %}
-{% import "components/components.html" as components %}
 {% block content %}
 <ol class="breadcrumb">
   <li><a href="/{{ root_url }}/">Home</a></li>
@@ -18,26 +19,5 @@
   <li class="active">{{ lodel_id }}</li>
 </ol>
 <h1 class="h1_lodel">Lodel 2 - {{ classname }} with uid {{ lodel_id }}</h1>
-<ul>
-    <!-- To get a component HTML code, it is necessary to call : components.<macro_name>(args) -->
-    {% 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 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 }}" >{{ rel2 }}</a></li>
-                    {% endfor %}
-                        </ul></li>
-                {% endif %}
-            {% else %}
-                <li> {{ fieldname }} : {{ obj.data(fieldname) }} </li>
-            {% endif %}
-        {% endif %}
-    {% endfor %}
-</ul>
+    {{ show_object.object_ul(obj) }}
 {% endblock %}

lodel/plugins/webui/templates/listing/show_object_detailled.html

@@ -1,7 +1,12 @@
 {% extends "base.html" %}
+{% import 'macros/show_object.html' as show_object %}
 {% import 'components/components.html' as components %}
 {% import "listing/display_obj.html" as edit %}
 {% set my_class = leapi.name2class(classname) %}
+{% set obj = my_class.get_from_uid(lodel_id) %}
+{% if obj is none %}
+    ERROR <!-- conception failure, the controller should test this before calling the template -->
+{% endif %}
 {% set uidfield = my_class.uid_fieldname()[0] %}
 {% set objects = my_class.get(('%s = %s') % (uidfield, lodel_id)) %}
 {% set obj = objects.pop() %}
@@ -18,26 +23,5 @@
   <li class="active">{{ lodel_id }}</li>
 </ol>
 <h1 class="h1_lodel">Lodel 2 - {{ classname }} with uid {{ lodel_id }}</h1>
-<ul>
-    <!-- To get a component HTML code, it is necessary to call : components.<macro_name>(args) -->
-    {% 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>
-                    {% set linked_objs=l_classe.get(("%s in (%s)") % (l_classe.uid_fieldname()[0], obj.data(fieldname)|join(','))) %}
-                    {% for linked_obj in linked_objs %}
-                            {{ edit.display(linked_obj) }}
-                            <br/>
-                    {% endfor %}
-                        </ul></li>
-                {% endif %}
-            {% else %}
-                <li> {{ fieldname }} : {{ obj.data(fieldname) }} </li>
-            {% endif %}
-        {% endif %}
-    {% endfor %}
-</ul>
+    {{ show_object.object_ul(obj, 2) }}
 {% endblock %}

lodel/plugins/webui/templates/macros/show_object.html

@@ -0,0 +1,38 @@
+<!-- Produce a <li></li> with objects informations -->
+{% macro object_ul(leo, max_depth = 0, exclude = []) -%}
+    <ul>
+        {% if max_depth <= 0 %}
+            <!-- No need to go deeper -->
+            {% for fname, fvalue in leo.datas(True).items() %}
+                <li><em>{{ fname }}</em> : {{fvalue}}</li>
+            {%endfor%}
+        {% else %}
+            {% for fname in leo.fieldnames(True) %}
+                {% set fvalue = leo.data(fname) %}
+                {% set fdh = leo.data_handler(fname) %}
+                {% if fvalue is not none and fdh.is_reference() %}
+                    {% if fdh.is_singlereference() %}
+                        {% set referenced = fdh.get_referenced(fvalue) %}
+                        {% if (referenced.__class__.__name__, referenced.uid) in exclude %}
+                            <li><em>{{fname}}</em> : {{fvalue}}</li>
+                        {% else %}
+                            <li><em>{{fname}}</em> : {{object_ul(referenced, max_depth - 1, exclude + [(leo.__class__.__name__, leo.uid())] )}}</li>
+                        {% endif %}
+                    {% else %}
+                        <li><em>{{fname}}</em> : <ul>
+                        {% for referenced in fdh.get_referenced(fvalue) %}
+                            {% if (referenced.__class__.__name__, referenced.uid) in exclude %}
+                                <li><em>{{fname}}</em> : {{fvalue}}</li>
+                            {% else %}
+                                <li><em>{{fname}}</em> : {{object_ul(referenced, max_depth - 1, exclude + [(leo.__class__.__name__, leo.uid())] )}}</li>
+                            {% endif %}
+                        {% endfor %}
+                        </ul></li>
+                    {% endif %}
+                {% else %}
+                    <li><em>{{fname}}</em> : {{fvalue}}</li>
+                {% endif %}
+            {% endfor %}
+        {% endif %}
+    </ul>
+{%- endmacro %}