]> git.llucax.com Git - software/sercom.git/commitdiff
projects / software / sercom.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 695266c)
muevo entrega a donde queria.
authorRicardo Markieicz <rmarkie@fi.uba.ar>
Sun, 25 Feb 2007 23:05:15 +0000 (23:05 +0000)
committerRicardo Markieicz <rmarkie@fi.uba.ar>
Sun, 25 Feb 2007 23:05:15 +0000 (23:05 +0000)
sercom/controllers.py patch | blob | history
sercom/subcontrollers/__init__.py patch | blob | history
sercom/subcontrollers/ejercicio/__init__.py patch | blob | history
sercom/subcontrollers/ejercicio/entrega/__init__.py [moved from sercom/subcontrollers/entrega/__init__.py with 100% similarity] patch | blob | history
sercom/subcontrollers/ejercicio/entrega/templates/__init__.py [new file with mode: 0644] patch | blob
sercom/subcontrollers/ejercicio/entrega/templates/list.kid [moved from sercom/subcontrollers/entrega/templates/list.kid with 97% similarity] patch | blob | history
sercom/subcontrollers/ejercicio/entrega/templates/new.kid [moved from sercom/subcontrollers/entrega/templates/new.kid with 91% similarity] patch | blob | history

diff --git a/sercom/controllers.py b/sercom/controllers.py
index 6132eb26e0c4d7c43bf954f2f8a4d1e0e52d7ee7..b1e8ed142c3bcdc07a3808631bc6929a0b71769a 100644 (file)
--- 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 97976ee8c1be48e026f74e1f3160147a8c85a7b5..f650c14cefcf3463f60c223fbfdb6d0eba2f0b47 100644 (file)
--- 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 c5335063edbd4fcaf1dfffe2d7c84ec28295c77e..84057dff3e5d722f4396475877ab2baa88ada2f7 100644 (file)
--- 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/ejercicio/entrega/templates/__init__.py b/sercom/subcontrollers/ejercicio/entrega/templates/__init__.py
new file mode 100644 (file)
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 c309c89bb2e16e66c73faa55388c4ce48aaf829e..a21461557e5401c351df632d0a6f66999bbfb7d3 100644 (file)
--- a/sercom/subcontrollers/entrega/templates/list.kid
+++ b/sercom/subcontrollers/ejercicio/entrega/templates/list.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
-    py:extends="'../../../templates/master.kid'">
+    py:extends="'../../../../templates/master.kid'">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
 <title>list</title>
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 500ed08bbce2068c2682681ca9c71acf3a680f39..39629f351079b7513eb316ac6b4bb004aede0a69 100644 (file)
--- a/sercom/subcontrollers/entrega/templates/new.kid
+++ b/sercom/subcontrollers/ejercicio/entrega/templates/new.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
-    py:extends="'../../../templates/master.kid'">
+    py:extends="'../../../../templates/master.kid'">
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
 <title>new</title>
Sistema de entrega electrónica de Taller de Programación I