summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2014-02-07 15:10:05 +0100
committerXavier Morel <xmo@openerp.com>2014-05-19 08:32:14 +0200
commit290883ab2f46220e2c5ae1aa2231e9f0c1041412 (patch)
tree3ed826fd5a04d1a38749b65cc215f94ef34b3f68 /doc
parentbe1fe080c93d735dd41b1c8bf8427e68ba90db6a (diff)
[FIX] fixed ta controller parameter in wrong patch
Diffstat (limited to 'doc')
-rw-r--r--doc/howto/howto_website/ta-t-field14
-rw-r--r--doc/howto/howto_website/ta-view-fix7
2 files changed, 5 insertions, 16 deletions
diff --git a/doc/howto/howto_website/ta-t-field b/doc/howto/howto_website/ta-t-field
index 9bc52d052dd..7f6f9e296ab 100644
--- a/doc/howto/howto_website/ta-t-field
+++ b/doc/howto/howto_website/ta-t-field
@@ -1,18 +1,6 @@
# HG changeset patch
-# Parent 8129831c739fb22d1f6fbccdc6f453f6a0a9e24f
+# Parent 48c349d1df4e975b47b34afbbb527f023f4f7ca0
-diff --git a/controllers/my_controller.py b/controllers/my_controller.py
---- a/controllers/my_controller.py
-+++ b/controllers/my_controller.py
-@@ -13,7 +13,7 @@ class my_controller(main.Home):
- })
-
- @http.route('/tas/<model("academy.tas"):ta>/', auth='public', website=True)
-- def ta(self, id):
-+ def ta(self, ta):
- return http.request.website.render('academy.ta', {
- 'ta': ta,
- })
diff --git a/views/templates.xml b/views/templates.xml
--- a/views/templates.xml
+++ b/views/templates.xml
diff --git a/doc/howto/howto_website/ta-view-fix b/doc/howto/howto_website/ta-view-fix
index dac105dba9e..c1ad0adc139 100644
--- a/doc/howto/howto_website/ta-view-fix
+++ b/doc/howto/howto_website/ta-view-fix
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent fa3e25d0315e54de4bd983ad8532044b5e2df233
+# Parent 548ab57454752e9575323e26d0471669c78172f6
diff --git a/controllers/my_controller.py b/controllers/my_controller.py
--- a/controllers/my_controller.py
@@ -9,9 +9,10 @@ diff --git a/controllers/my_controller.py b/controllers/my_controller.py
})
- @http.route('/tas/<int:id>/', auth='public', website=True)
-+ @http.route('/tas/<model("academy.tas"):ta>/', auth='public', website=True)
- def ta(self, id):
+- def ta(self, id):
- return http.request.website.render('academy.ta', teaching_assistants[id])
++ @http.route('/tas/<model("academy.tas"):ta>/', auth='public', website=True)
++ def ta(self, ta):
+ return http.request.website.render('academy.ta', {
+ 'ta': ta,
+ })