Corrections

lodel/leapi/leobject.py

@@ -226,7 +226,7 @@ class LeObject(object):
         uid_handlers = set( cls._fields[name] for name in cls._uid )
         for pcls in cls.hierarch()[1:]:
             puid_handlers = set(cls._fields[name] for name in pcls._uid)
-            if set(pcls._uid) != set(pcls._uid) \
+            if set(pcls._uid) != set(prev._uid) \
                 or puid_handlers != uid_handlers:
                 break
             prev = pcls

plugins/webui/interface/controllers/admin.py

@@ -30,8 +30,8 @@ def admin_update(request):
         obj = (target_leo.get(('lodel_id = %s' % (uid))))[0]
         inserted = obj.update(fields)
         
-        if new_uid==1:
-            msg = 'Successfull creation';
+        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)
@@ -51,10 +51,19 @@ def admin_update(request):
         obj = dyncode.Object.get(['lodel_id = %d' % lodel_id])
         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
     template_vars = {
         'params': request.GET
     }
-    return get_response('admin/admin_edit.html', tpl_vars=template_vars)
+    return get_response('admin/admin_edit.html', target=target_leo, lodel_id =lodel_id, tpl_vars=template_vars)
 
 def admin_create(request):
     classname = None

plugins/webui/templates/admin/admin_edit.html

@@ -1,16 +1,13 @@
 {% extends "base_backend.html" %}
 {% import "admin/editable_component.html" as edit %}
-{% set my_id = params['lodel_id'].pop() %}
-{% set classname = params['classname'].pop() %}}
-{% set my_class = leapi.Object.name2class(classname) %}
-{% set objects = my_class.get(('lodel_id = %s') % (my_id)) %}
+{% set objects = target.get(('lodel_id = %s') % (lodel_id)) %}
 {% set obj = objects.pop() %}
 {% block title %}- Edit Object{% endblock %}
 {% block body %}
-<h1>Lodel 2 - Edit Object {{ my_id }} of {{ classname }}</h1>
+<h1>Lodel 2 - Edit Object {{ lodel_id }} of {{ target.__name__ }}</h1>
     <form action="" method ="post">
-    <input type="hidden" name="uid" value="{{ my_id}}" >
-    <input type="hidden" name="classname" value={{ classname }} />
+    <input type="hidden" name="uid" value="{{ lodel_id}}" >
+    <input type="hidden" name="classname" value={{ target.__name__ }} />
     {% for fieldname, fieldvalue in obj.fields().items() %}
        <p> {{edit.input(fieldname, fieldvalue, obj.data(fieldname)) }} </p>
     {% endfor %}