Changes in the interface - adding delete option

plugins/webui/interface/controllers/admin.py

@@ -36,9 +36,13 @@ def admin_update(request):
 
         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
+                dhl = target_leo.data_handler(in_put[12:])
+                if dhl.is_reference() and in_value != '':
+                    in_value.replace(" ","")
+                    in_value=in_value.split(',')
+                    in_value=list(in_value)
+                if in_value != '':
+                    fields[in_put[12:]] = in_value
 
         filter_q = '%s = %s' % (uid_field, uid)
         obj = (target_leo.get((filter_q)))[0]
@@ -130,6 +134,50 @@ def admin_create(request):
         raise HttpException(400)
     return get_response('admin/admin_create.html', target=target_leo)
 
+def admin_delete(request):
+    if WebUiClient.is_anonymous():
+        return get_response('users/signin.html')
+    classname = None
+
+    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
+
+    if test_valid:
+        try:
+            dh = target_leo.field(uid_field)
+            lodel_id = dh.cast_type(request.GET['lodel_id'][0])
+        except (ValueError, TypeError):
+            test_valid = False
+
+    if not test_valid:
+        raise HttpException(400)
+    else:
+        query_filters = list()
+        query_filters.append((uid_field,'=',lodel_id))
+        nb_deleted = target_leo.delete_bundle(query_filters)
+
+    if nb_deleted == 1:
+            msg = 'Object successfully deleted';
+    else:
+            msg = 'Oops something wrong happened...object still here'
+            
+    return get_response('admin/admin_delete.html', target=target_leo, lodel_id =lodel_id, msg = msg)
+
+        
+        
 def admin_classes(request):
     if WebUiClient.is_anonymous():
         return get_response('users/signin.html')
@@ -139,6 +187,11 @@ def create_object(request):
     if WebUiClient.is_anonymous():
         return get_response('users/signin.html')
     return get_response('admin/list_classes_create.html', my_classes = dyncode.dynclasses)
+
+def delete_object(request):
+    if WebUiClient.is_anonymous():
+        return get_response('users/signin.html')
+    return get_response('admin/list_classes_delete.html', my_classes = dyncode.dynclasses)
     
 def admin_class(request):
     if WebUiClient.is_anonymous():
@@ -155,7 +208,23 @@ def admin_class(request):
     if classname is None or target_leo.is_abstract():
         raise HttpException(400)
     return get_response('admin/show_class_admin.html', target=target_leo)
-   
+
+def delete_in_class(request):
+    if WebUiClient.is_anonymous():
+        return get_response('users/signin.html')
+    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
+    if classname is None or target_leo.is_abstract():
+        raise HttpException(400)
+    return get_response('admin/show_class_delete.html', target=target_leo)
+
 def admin(request):
     if WebUiClient.is_anonymous():
         return get_response('users/signin.html')

plugins/webui/interface/urls.py

@@ -6,9 +6,12 @@ urls = (
     (r'^/admin/?$', admin),
     (r'^/admin/create$', admin_create),
     (r'^/admin/update$', admin_update),
+    (r'^/admin/delete$', admin_delete),
     (r'^/admin/classes_admin', admin_classes),
     (r'^/admin/object_create', create_object),
+    (r'^/admin/object_delete', delete_object),
     (r'^/admin/class_admin$', admin_class),
+    (r'^/admin/class_delete$', delete_in_class),
     (r'/test/(?P<id>.*)$', test),
     (r'^/test/?$', test),
     (r'^/list_classes', list_classes),

plugins/webui/templates/admin/admin.html

@@ -6,8 +6,9 @@
 </ol>
 <h1 class="h1_lodel">{{settings.sitename}} administration</h1>
 <ul>
-    <li><a href="admin/classes_admin">Edit object</a></li>
-    <li><a href="admin/object_create">Create object</a></li>
+    <li><a href="admin/classes_admin">Edit an object</a></li>
+    <li><a href="admin/object_create">Create an object</a></li>
+    <li><a href="admin/object_delete">Delete an object</a></li>
 </ul>
 
 {% endblock %}

plugins/webui/templates/admin/editable_component.html

@@ -1,6 +1,9 @@
 {% macro input(fieldname, field, value='') -%}
 	<label for="field_input_{{fieldname}}" class="col-sm-2 control-label">{{fieldname}}</label>
     <div class="col-xs-6">
+	{% if value == None %}
+		{% set value = '' %}
+	{% endif %}
 	{% if field.base_type == 'bool' %}
 		<input id="field_input_{{fieldname}}" class="form-control" name="field_input_{{fieldname}}" type="checkbox" checked="{% if value %}checked{% endif %}" >
 	{% elif field.base_type == 'password' %}
@@ -15,7 +18,7 @@
         {% endif %}
         {% if field.directly_editable %}
             <input id="{{fieldname}}" class="form-control" name="field_input_{{fieldname}}" type="text" value="{{sval}}" >
-            {% set l_classe = field.linked_classes %}
+            {% set l_classe = field.allowed_classes %}
             <p> Please enter uids to instances of {{ l_classe.__name__ }} separated by commas </p>
         {% else %}
             <input id="{{fieldname}}" class="form-control" name="field_input_{{fieldname}}" type="text" value="{{sval}}" readonly >

plugins/webui/templates/base_backend.html

@@ -28,6 +28,7 @@
             <li class="active"><a href="/{{ root_url }}/admin">Home</a></li>
             <li><a href="/{{ root_url }}/admin/object_create">Create</a></li>
             <li><a href="/{{ root_url }}/admin/classes_admin">Edit</a></li>
+            <li><a href="/{{ root_url }}/admin/object_delete">Delete</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right">
             <li><a href="/{{ root_url }}/">Front-End</a></li>