From: Ricardo Markieicz Date: Sun, 25 Feb 2007 23:05:15 +0000 (+0000) Subject: muevo entrega a donde queria. X-Git-Tag: pre-merge~109 X-Git-Url: https://git.llucax.com/z.facultad/75.52/sercom.git/commitdiff_plain/875c6cd6901bd62d1242f180b88d9829000bb606?ds=sidebyside muevo entrega a donde queria. --- diff --git a/sercom/controllers.py b/sercom/controllers.py index 6132eb2..b1e8ed1 100644 --- a/sercom/controllers.py +++ b/sercom/controllers.py @@ -85,8 +85,6 @@ class Root(controllers.RootController): ejercicio = EjercicioController() - entrega = EntregaController() - caso_de_prueba = CasoDePruebaController() curso = CursoController() diff --git a/sercom/subcontrollers/__init__.py b/sercom/subcontrollers/__init__.py index 97976ee..f650c14 100644 --- a/sercom/subcontrollers/__init__.py +++ b/sercom/subcontrollers/__init__.py @@ -4,4 +4,3 @@ from curso import CursoController from enunciado import EnunciadoController from caso_de_prueba import CasoDePruebaController from ejercicio import EjercicioController -from entrega import EntregaController diff --git a/sercom/subcontrollers/ejercicio/__init__.py b/sercom/subcontrollers/ejercicio/__init__.py index c533506..84057df 100644 --- a/sercom/subcontrollers/ejercicio/__init__.py +++ b/sercom/subcontrollers/ejercicio/__init__.py @@ -12,6 +12,8 @@ from sercom.subcontrollers import validate as val from sercom.model import Ejercicio, Curso, Enunciado from cherrypy import request, response +from entrega import * + #}}} #{{{ Configuración @@ -99,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""" diff --git a/sercom/subcontrollers/entrega/__init__.py b/sercom/subcontrollers/ejercicio/entrega/__init__.py similarity index 100% rename from sercom/subcontrollers/entrega/__init__.py rename to sercom/subcontrollers/ejercicio/entrega/__init__.py diff --git a/sercom/subcontrollers/ejercicio/entrega/templates/__init__.py b/sercom/subcontrollers/ejercicio/entrega/templates/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sercom/subcontrollers/entrega/templates/list.kid b/sercom/subcontrollers/ejercicio/entrega/templates/list.kid similarity index 97% rename from sercom/subcontrollers/entrega/templates/list.kid rename to sercom/subcontrollers/ejercicio/entrega/templates/list.kid index c309c89..a214615 100644 --- a/sercom/subcontrollers/entrega/templates/list.kid +++ b/sercom/subcontrollers/ejercicio/entrega/templates/list.kid @@ -1,6 +1,6 @@ + py:extends="'../../../../templates/master.kid'"> list diff --git a/sercom/subcontrollers/entrega/templates/new.kid b/sercom/subcontrollers/ejercicio/entrega/templates/new.kid similarity index 91% rename from sercom/subcontrollers/entrega/templates/new.kid rename to sercom/subcontrollers/ejercicio/entrega/templates/new.kid index 500ed08..39629f3 100644 --- a/sercom/subcontrollers/entrega/templates/new.kid +++ b/sercom/subcontrollers/ejercicio/entrega/templates/new.kid @@ -1,6 +1,6 @@ + py:extends="'../../../../templates/master.kid'"> new