Usar folding.

[z.facultad/75.52/sercom.git] / sercom / subcontrollers / enunciado / __init__.py

diff --git a/sercom/subcontrollers/enunciado/__init__.py b/sercom/subcontrollers/enunciado/__init__.py
index f8b045ca9527a06ed129b24ba4e21040972e728b..818fda3fd2acd080d2d0133874c04a5a34fd3f4f 100644 (file)
--- a/sercom/subcontrollers/enunciado/__init__.py
+++ b/sercom/subcontrollers/enunciado/__init__.py
@@ -1,5 +1,6 @@
 # vim: set et sw=4 sts=4 encoding=utf-8 :
 
 # vim: set et sw=4 sts=4 encoding=utf-8 :
 

+#{{{ Imports

 from turbogears import controllers, expose, redirect
 from turbogears import validate, validators, flash, error_handler
 from turbogears.widgets import *
 from turbogears import controllers, expose, redirect
 from turbogears import validate, validators, flash, error_handler
 from turbogears.widgets import *


@@ -8,7 +9,9 @@ from turbogears import paginate
 from docutils.core import publish_parts
 from sercom.subcontrollers import validate as val
 from sercom.model import Enunciado, Docente
 from docutils.core import publish_parts
 from sercom.subcontrollers import validate as val
 from sercom.model import Enunciado, Docente

+#}}}

 
 

+#{{{ Configuración

 cls = Enunciado
 name = 'enunciado'
 namepl = name + 's'
 cls = Enunciado
 name = 'enunciado'
 namepl = name + 's'


@@ -16,7 +19,9 @@ namepl = name + 's'
 fkcls = Docente
 fkname = 'autor'
 fknamepl = fkname + 'es'
 fkcls = Docente
 fkname = 'autor'
 fknamepl = fkname + 'es'

+#}}}

 
 

+#{{{ Validación

 def validate_fk(data):
     fk = data.get(fkname + 'ID', None)
     if fk == 0: fk = None
 def validate_fk(data):
     fk = data.get(fkname + 'ID', None)
     if fk == 0: fk = None


@@ -24,9 +29,9 @@ def validate_fk(data):
         try:
             fk = fkcls.get(fk)
         except LookupError:
         try:
             fk = fkcls.get(fk)
         except LookupError:

-            raise redirect('new', tg_flash=_(u'No se pudo crear el nuevo ' \
-                '%s porque el %s con identificador %d no existe.'
-                    % (name, fkname, fk)), **data)
+            flash(_(u'No se pudo crear el nuevo %s porque el %s con '
+                'identificador %d no existe.' % (name, fkname, fk)))
+            raise redirect('new', **data)

     data.pop(fkname + 'ID', None)
     data[fkname] = fk
     return fk
     data.pop(fkname + 'ID', None)
     data[fkname] = fk
     return fk


@@ -41,7 +46,9 @@ def validate_set(id, data):
 def validate_new(data):
     validate_fk(data)
     return val.validate_new(cls, name, data)
 def validate_new(data):
     validate_fk(data)
     return val.validate_new(cls, name, data)

+#}}}

 
 

+#{{{ Formulario

 def get_options():
     return [(0, _(u'--'))] + [(fk.id, fk.shortrepr()) for fk in fkcls.select()]
 
 def get_options():
     return [(0, _(u'--'))] + [(fk.id, fk.shortrepr()) for fk in fkcls.select()]
 


@@ -54,7 +61,10 @@ form = TableForm(fields=[
     TextField(name='descripcion', label=_(u'Descripción'),
         validator=validators.UnicodeString(not_empty=False, max=255, strip=True)),
 ])
     TextField(name='descripcion', label=_(u'Descripción'),
         validator=validators.UnicodeString(not_empty=False, max=255, strip=True)),
 ])

+form.javascript.append(JSSource("MochiKit.DOM.focusOnLoad('form_nombre');"))
+#}}}

 
 

+#{{{ Controlador

 class EnunciadoController(controllers.Controller, identity.SecureResource):
     """Basic model admin interface"""
     require = identity.has_permission('admin')
 class EnunciadoController(controllers.Controller, identity.SecureResource):
     """Basic model admin interface"""
     require = identity.has_permission('admin')


@@ -71,19 +81,18 @@ class EnunciadoController(controllers.Controller, identity.SecureResource):
     @expose(template='kid:%s.templates.list' % __name__)
     @validate(validators=dict(autor=validators.Int))
     @paginate('records')
     @expose(template='kid:%s.templates.list' % __name__)
     @validate(validators=dict(autor=validators.Int))
     @paginate('records')

-    def list(self, autor=None, tg_flash=None):
+    def list(self, autor=None):

         """List records in model"""
         if autor is None:
             r = cls.select()
         else:
             r = cls.selectBy(autorID=autor)
         """List records in model"""
         if autor is None:
             r = cls.select()
         else:
             r = cls.selectBy(autorID=autor)

-        return dict(records=r, name=name, namepl=namepl, tg_flash=tg_flash)
+        return dict(records=r, name=name, namepl=namepl, parcial=autor)

 
     @expose(template='kid:%s.templates.new' % __name__)
     def new(self, **kw):
         """Create new records in model"""
 
     @expose(template='kid:%s.templates.new' % __name__)
     def new(self, **kw):
         """Create new records in model"""

-        f = kw.get('tg_flash', None)
-        return dict(name=name, namepl=namepl, form=form, tg_flash=f, values=kw)
+        return dict(name=name, namepl=namepl, form=form, values=kw)

 
     @validate(form=form)
     @error_handler(new)
 
     @validate(form=form)
     @error_handler(new)


@@ -91,14 +100,14 @@ class EnunciadoController(controllers.Controller, identity.SecureResource):
     def create(self, **kw):
         """Save or create record to model"""
         validate_new(kw)
     def create(self, **kw):
         """Save or create record to model"""
         validate_new(kw)

-        raise redirect('list', tg_flash=_(u'Se creó un nuevo %s.') % name)
+        flash(_(u'Se creó un nuevo %s.') % name)
+        raise redirect('list')

 
     @expose(template='kid:%s.templates.edit' % __name__)
     def edit(self, id, **kw):
         """Edit record in model"""
         r = validate_get(id)
 
     @expose(template='kid:%s.templates.edit' % __name__)
     def edit(self, id, **kw):
         """Edit record in model"""
         r = validate_get(id)

-        return dict(name=name, namepl=namepl, record=r, form=form,
-            tg_flash=kw.get('tg_flash', None))
+        return dict(name=name, namepl=namepl, record=r, form=form)

 
     @validate(form=form)
     @error_handler(edit)
 
     @validate(form=form)
     @error_handler(edit)


@@ -106,8 +115,8 @@ class EnunciadoController(controllers.Controller, identity.SecureResource):
     def update(self, id, **kw):
         """Save or create record to model"""
         r = validate_set(id, kw)
     def update(self, id, **kw):
         """Save or create record to model"""
         r = validate_set(id, kw)

-        raise redirect('../list',
-            tg_flash=_(u'El %s fue actualizado.') % name)
+        flash(_(u'El %s fue actualizado.') % name)
+        raise redirect('../list')

 
     @expose(template='kid:%s.templates.show' % __name__)
     def show(self,id, **kw):
 
     @expose(template='kid:%s.templates.show' % __name__)
     def show(self,id, **kw):


@@ -124,6 +133,7 @@ class EnunciadoController(controllers.Controller, identity.SecureResource):
         """Destroy record in model"""
         r = validate_get(id)
         r.destroySelf()
         """Destroy record in model"""
         r = validate_get(id)
         r.destroySelf()

-        raise redirect('../list',
-            tg_flash=_(u'El %s fue eliminado permanentemente.') % name)
+        flash(_(u'El %s fue eliminado permanentemente.') % name)
+        raise redirect('../list')
+#}}}