X-Git-Url: https://git.llucax.com/software/sercom.git/blobdiff_plain/65b45e5ceacbabe6f5851b83a57e94fe72ab0317..da423dfdeefd1a24017b7980dde722676c31d3a5:/sercom/subcontrollers/ejercicio/__init__.py?ds=sidebyside diff --git a/sercom/subcontrollers/ejercicio/__init__.py b/sercom/subcontrollers/ejercicio/__init__.py index f0b0157..84057df 100644 --- a/sercom/subcontrollers/ejercicio/__init__.py +++ b/sercom/subcontrollers/ejercicio/__init__.py @@ -11,6 +11,9 @@ from docutils.core import publish_parts from sercom.subcontrollers import validate as val from sercom.model import Ejercicio, Curso, Enunciado from cherrypy import request, response + +from entrega import * + #}}} #{{{ Configuración @@ -98,6 +101,8 @@ class EjercicioController(controllers.Controller, identity.SecureResource): """Basic model admin interface""" require = identity.has_permission('admin') + entrega = EntregaController() + @expose() def default(self, tg_errors=None): """handle non exist urls""" @@ -148,10 +153,6 @@ class EjercicioController(controllers.Controller, identity.SecureResource): def show(self,id, **kw): """Show record in model""" r = validate_get(id) - if r.descripcion is None: - r.desc = '' - else: - r.desc = publish_parts(r.descripcion, writer_name='html')['html_body'] return dict(name=name, namepl=namepl, record=r) @expose()