[FIX] remove fixed todos, fix incorrect t-field use

diff --git a/doc/howto/howto_website.rst b/doc/howto/howto_website.rst
index 2754478..b760d57 100644 (file)
--- a/doc/howto/howto_website.rst
+++ b/doc/howto/howto_website.rst
@@ -272,8 +272,6 @@ used for a single page, or to add content in HTML fields.
     each page. As a result, it's safe to use dedicated-content snippets for
     "static" pages.
 
-Time, then, to create more specific content.
-
 Storing data in OpenERP
 =======================
 
@@ -304,14 +302,14 @@ Let's add them in data files:
 
 .. patch::
 
-Update the module again, reload `your openerp`_ and the TAs are back. Click on
-a TA name, and you'll see an error message. Let's fix the TA view now:
+Update the module again, reload `your openerp`_ and the TAs are back.
 
-.. todo:: if ta template was modified in previous section, it's marked
-          noupdate and updating the module will have no effect for no known
-          reason. That's really quite annoying.
+.. warning:: if you can't see your data, check that you have reloaded the
+             server with ``-i academy``, not ``-u academy``, new data files
+             are not installed with ``-u``.
 
-          Ensure that ``-i`` does discard the noupdate-marked template
+Click on a TA name, and you'll see an error message. Let's fix the TA view
+now:
 
 .. patch::
 
@@ -358,9 +356,6 @@ object-aware template tag:
 
 .. patch::
 
-.. todo:: updating the ``name`` field from the RTE altered the template, which
-          locked it...
-
 Update the module, browse to a TA's page and open the edition mode (using the
 :guilabel:`Edit` button in the window's top-right).  The empty HTML field now
 displays a big placeholder image, if you drop snippets in or write some

diff --git a/doc/howto/howto_website/ta-t-field b/doc/howto/howto_website/ta-t-field
index 7f6f9e2..a61bec8 100644 (file)
--- a/doc/howto/howto_website/ta-t-field
+++ b/doc/howto/howto_website/ta-t-field
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 48c349d1df4e975b47b34afbbb527f023f4f7ca0
+# Parent 9d054be011cf2d3019e3b4d1be7cc95375044a05
 
 diff --git a/views/templates.xml b/views/templates.xml
 --- a/views/templates.xml
@@ -9,7 +9,7 @@ diff --git a/views/templates.xml b/views/templates.xml
              <div class="oe_structure">
                  <div class="container">
 -                    <h1><t t-esc="ta.name"/></h1>
-+                    <h1><t t-field="ta.name"/></h1>
++                    <h1 t-field="ta.name"/>
                  </div>
              </div>
              <div class="oe_structure"/>

diff --git a/doc/howto/howto_website/ta-template-biography b/doc/howto/howto_website/ta-template-biography
index 9f596fa..70645b3 100644 (file)
--- a/doc/howto/howto_website/ta-template-biography
+++ b/doc/howto/howto_website/ta-template-biography
@@ -1,14 +1,13 @@
 # HG changeset patch
-# Parent bba1cb179e03ab82504d12accfe456633806ba06
+# Parent 3028c6855414a013dd18addbe102d7172bafc5af
+
 diff --git a/views/templates.xml b/views/templates.xml
 --- a/views/templates.xml
 +++ b/views/templates.xml
-@@ -35,7 +35,9 @@
-             <div class="oe_structure"/>
+@@ -36,6 +36,8 @@
              <div class="oe_structure">
                  <div class="container">
--                    <h1><t t-field="ta.name"/></h1>
-+                    <h1 t-field="ta.name"/>
+                     <h1 t-field="ta.name"/>
 +                    <h2>Biography</h2>
 +                    <div t-field="ta.biography"/>
                  </div>