Bugfix: Curso.add_ejercicio() ponía mal el número de ejercicio.

[z.facultad/75.52/sercom.git] / sercom / widgets.py

diff --git a/sercom/widgets.py b/sercom/widgets.py
index 419fa63adc2816bbfe57de6a0d92e746dd580751..612d9509ac8a7905fad789fa941de3d9fd9553e6 100644 (file)
--- a/sercom/widgets.py
+++ b/sercom/widgets.py
@@ -31,9 +31,6 @@ MultiSelectAjax = '''
         }
         MochiKit.DOM.appendChildNodes(lista, OPTION({'value':results.msg.id}, results.msg.value));
         l = MochiKit.DOM.getElement(lista);
-        for (i=0; i<l.options.length; i++) { 
-            l.options[i].selected = true; 
-        }
     }
 
     function _on_alumno_get_error(loading, results)
@@ -45,17 +42,22 @@ MultiSelectAjax = '''
 
     function sacar_de_la_lista(lista)
     {
-        l = MochiKit.DOM.getElement(lista);
-        if (l.selectedIndex < 0) return;
-        
-        /* caso especial, 1 solo item */
-        if (l.options.length == 1) {
-            l.options.length = 0
-            return;
-        }
+        replaceChildNodes(lista,
+            list(ifilterfalse(itemgetter('selected'), $(lista).options))
+        );
+    }
+
+    function _do_add(callback, texto, lista, loading)
+    {
+        url = callback(texto, lista);
+        t = MochiKit.DOM.getElement(texto);
 
-        for (i=l.selectedIndex; i<l.options.length-1;i++)
-            l.options[i] = l.options[i+1];
+        load = MochiKit.DOM.getElement(loading);
+        load.style.visibility = 'visible';
+        var d = loadJSONDoc(url);
+        d.addCallbacks(partial(_on_alumno_get_result, lista, loading), partial(_on_alumno_get_error, loading));
+        t.value = 'padron';
+        t.style.color = "#aaa";
     }
 '''
 
@@ -63,10 +65,13 @@ class AjaxMultiSelect(widgets.MultipleSelectField):
     template = '''
     <div style="width:250px" xmlns:py="http://purl.org/kid/ns#">  
     <div>
-    <input type="text" id="${field_id}_nuevo" size="10" />
+    <input type="text" id="${field_id}_nuevo" size="10" value="padron"
+        style="color:#aaa;"
+        onfocus="this.style.color='#000'; if (this.value =='padron') { this.value=''; }"
+        onblur="if (this.value == '') { this.style.color='#aaa'; this.value='padron'; }" />
     <img src="/static/images/loading.gif" align="baseline" style="visibility:hidden;" id="${name}_loading" width="16px" height="16px" />
     <input type="button" id="_agregar" value="Agregar"
-        onClick=" ${on_add}('${field_id}_nuevo', '${field_id}', '${name}_loading'); " />
+        onClick=" _do_add(${on_add}, '${field_id}_nuevo', '${field_id}', '${name}_loading'); " />
     </div>
     <div>
     <select