Replace the term lodel_id in the interface by LeObject class method

lodel/leapi/datahandlers/base_classes.py

@@ -193,6 +193,7 @@ 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
         if back_reference is not None:
             if len(back_reference) != 2:
                 raise ValueError("A tuple (classname, fieldname) expected but got '%s'" % back_reference)
@@ -213,7 +214,6 @@ class Reference(DataHandler):
     ##@brief Set the back reference for this field.
     def _set_back_reference(self, back_reference):
         self.__back_reference = back_reference
-        
 
     ##@brief Check value
     # @param value *

plugins/webui/interface/controllers/admin.py

@@ -18,6 +18,7 @@ def admin_update(request):
         error = None
         datas = list()
         classname = request.form['classname']
+        logger.warning('Composed uids broken here')
         uid = request.form['uid']
         try:
             target_leo = dyncode.Object.name2class(classname)
@@ -26,48 +27,59 @@ def admin_update(request):
         if classname is None or target_leo.is_abstract():
             raise HttpException(400)
         fieldnames = target_leo.fieldnames()
+
+        uid_field = target_leo.uid_fieldname()[0]
         fields = dict()
 
         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]
+            #elif in_put == 'classname':
+            #    fields['classname'] = in_value
+
+        filter_q = '%s = %s' % (uid_field, uid)
+        obj = (target_leo.get((filter_q)))[0]
+
         inserted = obj.update(fields)
         
         if inserted==1:
             msg = 'Successfully updated';
         else:
             msg = 'Oops something wrong happened...object not saved'
-        return get_response('admin/admin_edit.html', target=target_leo, lodel_id = uid, msg = msg)
+        return get_response('admin/admin_edit.html', target=target_leo, uidfield = uid_field, lodel_id = uid, msg = msg)
+
+    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
+            raise HttpException(400)
+        logger.warning('Composed uids broken here')
+        uid_field = target_leo.uid_fieldname()[0]
 
-    test_valid = 'lodel_id' in request.GET \
-        and len(request.GET['lodel_id']) == 1
+    test_valid = uid_field in request.GET \
+        and len(request.GET[uid_field]) == 1
 
     if test_valid:
         try:
-            lodel_id = int(request.GET['lodel_id'][0])
+            lodel_id = request.GET[uid_field][0]
         except (ValueError, TypeError):
             test_valid = False
 
     if not test_valid:
         raise HttpException(400)
     else:
-        obj = dyncode.Object.get(['lodel_id = %d' % lodel_id])
+        query_filters = list()
+        query_filters.append((uid_field,'=',lodel_id))
+        obj = dyncode.Object.get(query_filters)
         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('admin/admin_edit.html', target=target_leo, lodel_id =lodel_id)
+    return get_response('admin/admin_edit.html', target=target_leo, uidfield = uid_field, lodel_id =lodel_id)
 
 def admin_create(request):
     classname = None
@@ -88,8 +100,8 @@ 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
+            #else:
+            #    fields[in_put] = in_value
 
         new_uid = target_leo.insert(fields)
         

plugins/webui/interface/controllers/listing.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from .base import get_response
 from ...exceptions import *
+from lodel import logger
 import leapi_dyncode as dyncode
 
 def list_classes(request):
@@ -25,31 +26,37 @@ def show_class(request):
     return get_response('listing/show_class.html', classname=classname)
 
 def show_object(request):
-    template_vars = {
-        'params': request.GET
-    }
-    test_valid = 'lodel_id' in request.GET \
-        and len(request.GET['lodel_id']) == 1
+    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
+    else:
+        raise HttpException(400)
+    
+    logger.warning('Composed uids broken here')
+    uid_field = target_leo.uid_fieldname()[0]
+    
+    test_valid = uid_field in request.GET \
+        and len(request.GET[uid_field]) == 1
 
     if test_valid:
         try:
-            lodel_id = int(request.GET['lodel_id'][0])
+            lodel_id = int(request.GET[uid_field][0])
         except (ValueError, TypeError):
             test_valid = False
 
     if not test_valid:
         raise HttpException(400)
     else:
-        obj = dyncode.Object.get(['lodel_id = %d' % lodel_id])
+        query_filters = list()
+        query_filters.append((uid_field,'=',lodel_id))
+        obj = dyncode.Object.get(query_filters)
         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)
+
+    return get_response('listing/show_object.html', lodel_id=lodel_id, uidfield = uid_field, classname=classname)

plugins/webui/run.py

@@ -13,9 +13,9 @@ from .client import WebUiClient
 from lodel.utils.datetime import get_utc_timestamp
 from lodel.plugin.hooks import LodelHook
 
-SESSION_FILES_BASE_DIR = Settings.sessions.directory
-SESSION_FILES_TEMPLATE = Settings.sessions.file_template
-SESSION_EXPIRATION_LIMIT = Settings.sessions.expiration
+SESSION_FILES_BASE_DIR = Settings.webui.sessions.directory
+SESSION_FILES_TEMPLATE = Settings.webui.sessions.file_template
+SESSION_EXPIRATION_LIMIT = Settings.webui.sessions.expiration
 
 session_store = FilesystemSessionStore(path=SESSION_FILES_BASE_DIR, filename_template=SESSION_FILES_TEMPLATE)
 

plugins/webui/templates/admin/admin_edit.html

@@ -1,6 +1,7 @@
 {% extends "base_backend.html" %}
 {% import "admin/editable_component.html" as edit %}
 {% set objects = target.get(('lodel_id = %s') % (lodel_id)) %}
+{% set objects = target.get(('%s = %s') % (uidfield, lodel_id)) %}
 {% set obj = objects.pop() %}
 {% block title %}- Edit Object{% endblock %}
 {% block body %}

plugins/webui/templates/admin/editable_component.html

@@ -12,7 +12,7 @@
         {% endif %}
         {% if field.directly_editable %}
             <input id="{{fieldname}}" name="field_input_{{fieldname}}" type="text" value="{{sval}}" >
-            {% set l_classe = field.allowed_classes %}
+            {% set l_classe = field._linked_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 >

plugins/webui/templates/listing/show_object.html

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