Arreglar jsonify.

[software/sercom.git] / sercom / controllers.py

diff --git a/sercom/controllers.py b/sercom/controllers.py
index 5e785eaf8d9fac42453fd8699255c708fd67024d..a69af2e5db25e88ca779e46fbdc6a1cd7ee348b7 100644 (file)
--- a/sercom/controllers.py
+++ b/sercom/controllers.py
@@ -1,17 +1,28 @@
 # vim: set et sw=4 sts=4 encoding=utf-8 :
 
 from turbogears import controllers, expose, view
 # vim: set et sw=4 sts=4 encoding=utf-8 :
 
 from turbogears import controllers, expose, view

-from turbogears import widgets as w, validators
+from turbogears import widgets as W, validators as V

 from turbogears import identity, redirect
 from cherrypy import request, response
 from model import *
 # from sercom import json
 
 from turbogears import identity, redirect
 from cherrypy import request, response
 from model import *
 # from sercom import json
 

-from subcontrollers import DocenteController
+from subcontrollers import *

 
 import logging
 log = logging.getLogger("sercom.controllers")
 
 
 import logging
 log = logging.getLogger("sercom.controllers")
 

+class LoginForm(W.TableForm):
+    fields = [
+        W.TextField(name='login_user', label=_(u'Usuario'),
+            validator=V.NotEmpty()),
+        W.PasswordField(name='login_password', label=_(u'Contraseña'),
+            validator=V.NotEmpty())
+    ]
+    javascript = [W.JSSource("MochiKit.DOM.focusOnLoad('form_login_user');")]
+    submit = W.SubmitButton(name='login_submit')
+    submit_text = _(u'Ingresar')
+

 class Root(controllers.RootController):
 
     @expose(template='.templates.welcome')
 class Root(controllers.RootController):
 
     @expose(template='.templates.welcome')


@@ -46,22 +57,13 @@ class Root(controllers.RootController):
             msg = _(u'Por favor ingrese.')
             forward_url = request.headers.get('Referer', '/')
 
             msg = _(u'Por favor ingrese.')
             forward_url = request.headers.get('Referer', '/')
 

-        fields = [
-            w.TextField(name='login_user', label=_(u'Usuario'),
-                validator=validators.NotEmpty()),
-            w.PasswordField(name='login_password', label=_(u'Contraseña'),
-                validator=validators.NotEmpty())
-        ]
+        fields = list(LoginForm.fields)

         if forward_url:
         if forward_url:

-            fields.append(w.HiddenField(name='forward_url'))
-        fields.extend([w.HiddenField(name=name) for name in request.params
+            fields.append(W.HiddenField(name='forward_url'))
+        fields.extend([W.HiddenField(name=name) for name in request.params

                 if name not in ('login_user', 'login_password', 'login_submit',
                                 'forward_url')])
                 if name not in ('login_user', 'login_password', 'login_submit',
                                 'forward_url')])

-
-        submit = w.SubmitButton(name='login_submit')
-
-        login_form = w.TableForm(fields=fields, action=previous_url,
-                        submit_text=_(u'Ingresar'), submit=submit)
+        login_form = LoginForm(fields=fields, action=previous_url)

 
         values = dict(forward_url=forward_url)
         values.update(request.params)
 
         values = dict(forward_url=forward_url)
         values.update(request.params)


@@ -77,6 +79,12 @@ class Root(controllers.RootController):
 
     docente = DocenteController()
 
 
     docente = DocenteController()
 

+    alumno = AlumnoController()
+
+    enunciado = EnunciadoController()
+
+    caso_de_prueba = CasoDePruebaController()
+

 #{{{ Agrega summarize a namespace tg de KID
 def summarize(text, size, concat=True, continuation='...'):
     """Summarize a string if it's length is greater than a specified size. This
 #{{{ Agrega summarize a namespace tg de KID
 def summarize(text, size, concat=True, continuation='...'):
     """Summarize a string if it's length is greater than a specified size. This