X-Git-Url: https://git.llucax.com/z.facultad/75.52/sercom.git/blobdiff_plain/93a72f008fd1db8fb8e7f2a0facd957595c42f89..4b7437a8033c0bc66eae8be038000a86dc54c35b:/sercom/subcontrollers/enunciado/__init__.py diff --git a/sercom/subcontrollers/enunciado/__init__.py b/sercom/subcontrollers/enunciado/__init__.py index 8f22b94..2195e2a 100644 --- a/sercom/subcontrollers/enunciado/__init__.py +++ b/sercom/subcontrollers/enunciado/__init__.py @@ -11,6 +11,8 @@ from docutils.core import publish_parts from sercom.subcontrollers import validate as val from sercom.model import Enunciado, Docente, Curso from cherrypy import request, response +from tarea import TareaController + #}}} #{{{ Configuración @@ -79,7 +81,9 @@ form = EnunciadoForm() #{{{ Controlador class EnunciadoController(controllers.Controller, identity.SecureResource): """Basic model admin interface""" - require = identity.has_permission('admin') + require = identity.has_permission('entregar') + + tarea = TareaController() @expose() def default(self, tg_errors=None): @@ -102,6 +106,7 @@ class EnunciadoController(controllers.Controller, identity.SecureResource): return dict(records=r, name=name, namepl=namepl, parcial=autor) @expose(template='kid:%s.templates.new' % __name__) + @identity.require(identity.has_permission('admin')) def new(self, **kw): """Create new records in model""" return dict(name=name, namepl=namepl, form=form, values=kw) @@ -109,6 +114,7 @@ class EnunciadoController(controllers.Controller, identity.SecureResource): @validate(form=form) @error_handler(new) @expose() + @identity.require(identity.has_permission('admin')) def create(self, archivo, **kw): """Save or create record to model""" kw['archivo'] = archivo.file.read() @@ -119,6 +125,7 @@ class EnunciadoController(controllers.Controller, identity.SecureResource): raise redirect('list') @expose(template='kid:%s.templates.edit' % __name__) + @identity.require(identity.has_permission('admin')) def edit(self, id, **kw): """Edit record in model""" r = validate_get(id) @@ -127,6 +134,7 @@ class EnunciadoController(controllers.Controller, identity.SecureResource): @validate(form=form) @error_handler(edit) @expose() + @identity.require(identity.has_permission('admin')) def update(self, id, **kw): """Save or create record to model""" r = validate_set(id, kw) @@ -144,6 +152,7 @@ class EnunciadoController(controllers.Controller, identity.SecureResource): return dict(name=name, namepl=namepl, record=r) @expose() + @identity.require(identity.has_permission('admin')) def delete(self, id): """Destroy record in model""" r = validate_get(id) @@ -160,6 +169,7 @@ class EnunciadoController(controllers.Controller, identity.SecureResource): return r.archivo @expose("json") + @identity.require(identity.has_permission('admin')) def de_curso(self, curso_id): c = Curso.get(curso_id) e = Enunciado.selectByCurso(c)