[IMP] doc/howtos/backend: improve views, fix workflow

stunna · Aug 26, 2014 · 436fa84 · 436fa84
1 parent 30469bd
commit 436fa84
Show file tree

Hide file tree

Showing 36 changed files with 297 additions and 373 deletions.
diff --git a/doc/howtos/backend/exercise-access-rights b/doc/howtos/backend/exercise-access-rights
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 303a5f4f011822dcb42b5833d579eabd3f03f4bf
 
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py	2014-08-24 12:26:40.449399183 +0200
-+++ doc-backend/openacademy/__openerp__.py	2014-08-24 12:26:40.445399183 +0200
+--- addons.orig/openacademy/__openerp__.py	2014-08-26 17:26:18.143783102 +0200
++++ addons/openacademy/__openerp__.py	2014-08-26 17:26:18.135783102 +0200
 @@ -25,7 +25,8 @@
 
      # always loaded
@@ -15,21 +15,21 @@ Index: doc-backend/openacademy/__openerp__.py
          'templates.xml',
          'views/openacademy.xml',
          'views/partner.xml',
-Index: doc-backend/openacademy/security/ir.model.access.csv
+Index: addons/openacademy/security/ir.model.access.csv
 ===================================================================
---- doc-backend.orig/openacademy/security/ir.model.access.csv	2014-08-24 12:26:40.449399183 +0200
-+++ doc-backend/openacademy/security/ir.model.access.csv	2014-08-24 12:26:55.985399543 +0200
+--- addons.orig/openacademy/security/ir.model.access.csv	2014-08-26 17:26:18.143783102 +0200
++++ addons/openacademy/security/ir.model.access.csv	2014-08-26 17:26:18.135783102 +0200
 @@ -1,2 +1,5 @@
  id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 -access_openacademy_openacademy,openacademy.openacademy,model_openacademy_openacademy,,1,0,0,0
 +course_manager,course manager,model_openacademy_course,group_manager,1,1,1,1
 +session_manager,session manager,model_openacademy_session,group_manager,1,1,1,1
 +course_read_all,course all,model_openacademy_course,,1,0,0,0
 +session_read_all,session all,model_openacademy_session,,1,0,0,0
-Index: doc-backend/openacademy/security/security.xml
+Index: addons/openacademy/security/security.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/security/security.xml	2014-08-24 12:26:40.445399183 +0200
++++ addons/openacademy/security/security.xml	2014-08-26 17:26:18.135783102 +0200
 @@ -0,0 +1,7 @@
 +<openerp>
 +    <data>

diff --git a/doc/howtos/backend/exercise-access-rules b/doc/howtos/backend/exercise-access-rules
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 0602022dc2a428f9995c886df33b699b6d3bcb69
 
-Index: doc-backend/openacademy/security/security.xml
+Index: addons/openacademy/security/security.xml
 ===================================================================
---- doc-backend.orig/openacademy/security/security.xml	2014-08-24 12:27:27.569400274 +0200
-+++ doc-backend/openacademy/security/security.xml	2014-08-24 12:28:29.185401700 +0200
+--- addons.orig/openacademy/security/security.xml	2014-08-26 17:26:18.971783090 +0200
++++ addons/openacademy/security/security.xml	2014-08-26 17:26:18.967783090 +0200
 @@ -3,5 +3,19 @@
          <record id="group_manager" model="res.groups">
              <field name="name">OpenAcademy / Manager</field>

diff --git a/doc/howtos/backend/exercise-advanced-treeview b/doc/howtos/backend/exercise-advanced-treeview
@@ -1,11 +1,11 @@
 # HG changeset patch
 # Parent f8d2422e87b3ff566dc947ad582608db3b15e077
 
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml	2014-08-24 12:13:41.149381146 +0200
-+++ doc-backend/openacademy/views/openacademy.xml	2014-08-24 12:13:41.141381146 +0200
-@@ -111,9 +111,10 @@
+--- addons.orig/openacademy/views/openacademy.xml	2014-08-26 17:26:09.283783234 +0200
++++ addons/openacademy/views/openacademy.xml	2014-08-26 17:26:09.279783234 +0200
+@@ -116,9 +116,10 @@
              <field name="name">session.tree</field>
              <field name="model">openacademy.session</field>
              <field name="arch" type="xml">

diff --git a/doc/howtos/backend/exercise-basic-action b/doc/howtos/backend/exercise-basic-action
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent 16e4cb131d9f7f3a72a8a1b0bc46c2ce9ac76435
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py	2014-08-24 12:02:32.169365663 +0200
-+++ doc-backend/openacademy/__openerp__.py	2014-08-24 12:02:32.165365663 +0200
+--- addons.orig/openacademy/__openerp__.py	2014-08-26 17:25:53.519783468 +0200
++++ addons/openacademy/__openerp__.py	2014-08-26 17:25:53.511783468 +0200
 @@ -27,6 +27,7 @@
      'data': [
          # 'security/ir.model.access.csv',
@@ -12,10 +12,10 @@ Index: doc-backend/openacademy/__openerp__.py
      ],
      # only loaded in demonstration mode
      'demo': [
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/views/openacademy.xml	2014-08-24 12:02:32.165365663 +0200
++++ addons/openacademy/views/openacademy.xml	2014-08-26 17:25:53.511783468 +0200
 @@ -0,0 +1,35 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<openerp>

diff --git a/doc/howtos/backend/exercise-calendar b/doc/howtos/backend/exercise-calendar
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 85a8d7317b9e13480f39ad739955442d15144451
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py	2014-08-25 16:18:57.920058347 +0200
-+++ doc-backend/openacademy/models.py	2014-08-25 16:19:22.872057976 +0200
+--- addons.orig/openacademy/models.py	2014-08-26 17:26:10.179783221 +0200
++++ addons/openacademy/models.py	2014-08-26 17:26:10.171783221 +0200
 @@ -1,5 +1,6 @@
  # -*- coding: utf-8 -*-
 
@@ -48,11 +48,11 @@ Index: doc-backend/openacademy/models.py
      @api.constrains('instructor_id', 'attendee_ids')
      def _check_instructor_not_in_attendees(self):
          if self.instructor_id and self.instructor_id in self.attendee_ids:
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml	2014-08-25 16:18:57.920058347 +0200
-+++ doc-backend/openacademy/views/openacademy.xml	2014-08-25 16:18:57.912058347 +0200
-@@ -120,11 +120,24 @@
+--- addons.orig/openacademy/views/openacademy.xml	2014-08-26 17:26:10.179783221 +0200
++++ addons/openacademy/views/openacademy.xml	2014-08-26 17:26:10.171783221 +0200
+@@ -125,11 +125,24 @@
              </field>
          </record>
 

diff --git a/doc/howtos/backend/exercise-computed b/doc/howtos/backend/exercise-computed
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent a358be0a577b0569831958a8ec1302825c645dee
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py	2014-08-24 12:09:36.289375479 +0200
-+++ doc-backend/openacademy/models.py	2014-08-24 12:09:59.961376027 +0200
+--- addons.orig/openacademy/models.py	2014-08-26 17:26:03.795783315 +0200
++++ addons/openacademy/models.py	2014-08-26 17:26:03.791783315 +0200
 @@ -28,3 +28,13 @@
      course_id = fields.Many2one('openacademy.course',
          ondelete='cascade', string="Course", required=True)
@@ -19,19 +19,19 @@ Index: doc-backend/openacademy/models.py
 +            self.taken_seats = 0.0
 +        else:
 +            self.taken_seats = 100.0 * len(self.attendee_ids) / self.seats
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml	2014-08-24 12:09:36.289375479 +0200
-+++ doc-backend/openacademy/views/openacademy.xml	2014-08-24 12:09:36.285375479 +0200
-@@ -98,6 +98,7 @@
-                         <field name="start_date"/>
-                         <field name="duration"/>
-                         <field name="seats"/>
-+                        <field name="taken_seats" widget="progressbar"/>
-                     </group>
-                     <separator string="Attendees" colspan="4"/>
-                     <field name="attendee_ids" colspan="4" nolabel="1"/>
-@@ -112,6 +113,7 @@
+--- addons.orig/openacademy/views/openacademy.xml	2014-08-26 17:26:03.795783315 +0200
++++ addons/openacademy/views/openacademy.xml	2014-08-26 17:26:03.791783315 +0200
+@@ -100,6 +100,7 @@
+                                 <field name="start_date"/>
+                                 <field name="duration"/>
+                                 <field name="seats"/>
++                                <field name="taken_seats" widget="progressbar"/>
+                             </group>
+                         </group>
+                         <label for="attendee_ids"/>
+@@ -117,6 +118,7 @@
                  <tree string="Session Tree">
                      <field name="name"/>
                      <field name="course_id"/>

diff --git a/doc/howtos/backend/exercise-constraint-python b/doc/howtos/backend/exercise-constraint-python
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 7a7d003fe38426a405ce0657a627a139133ec4dd
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py	2014-08-24 12:16:56.413385666 +0200
-+++ doc-backend/openacademy/models.py	2014-08-24 12:17:11.137386006 +0200
+--- addons.orig/openacademy/models.py	2014-08-26 17:26:06.591783274 +0200
++++ addons/openacademy/models.py	2014-08-26 17:26:06.587783274 +0200
 @@ -1,6 +1,6 @@
  # -*- coding: utf-8 -*-
 

diff --git a/doc/howtos/backend/exercise-constraint-sql b/doc/howtos/backend/exercise-constraint-sql
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 121bbfe120be3007f5e04611dbc27038abafcce8
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py	2014-08-24 12:17:23.789386299 +0200
-+++ doc-backend/openacademy/models.py	2014-08-24 12:17:23.785386299 +0200
+--- addons.orig/openacademy/models.py	2014-08-26 17:26:07.479783261 +0200
++++ addons/openacademy/models.py	2014-08-26 17:26:07.475783261 +0200
 @@ -14,6 +14,16 @@
          'openacademy.session', 'course_id', string="Session")
 

diff --git a/doc/howtos/backend/exercise-copy-override b/doc/howtos/backend/exercise-copy-override
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 7d14b75cdfd4c7a272a13572947de5d47f3e851f
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py	2014-08-24 12:17:34.389386545 +0200
-+++ doc-backend/openacademy/models.py	2014-08-24 12:17:34.381386544 +0200
+--- addons.orig/openacademy/models.py	2014-08-26 17:26:08.359783248 +0200
++++ addons/openacademy/models.py	2014-08-26 17:26:08.351783248 +0200
 @@ -14,6 +14,20 @@
          'openacademy.session', 'course_id', string="Session")
 

diff --git a/doc/howtos/backend/exercise-creation b/doc/howtos/backend/exercise-creation
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent 0000000000000000000000000000000000000000
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/__openerp__.py	2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/__openerp__.py	2014-08-26 17:25:49.787783523 +0200
 @@ -0,0 +1,35 @@
 +# -*- coding: utf-8 -*-
 +{
@@ -40,18 +40,18 @@ Index: doc-backend/openacademy/__openerp__.py
 +        'demo.xml',
 +    ],
 +}
-Index: doc-backend/openacademy/__init__.py
+Index: addons/openacademy/__init__.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/__init__.py	2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/__init__.py	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,3 @@
 +# -*- coding: utf-8 -*-
 +import controllers
 +import models
-Index: doc-backend/openacademy/controllers.py
+Index: addons/openacademy/controllers.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/controllers.py	2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/controllers.py	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,20 @@
 +# -*- coding: utf-8 -*-
 +from openerp import http
@@ -73,10 +73,10 @@ Index: doc-backend/openacademy/controllers.py
 +#         return http.request.render('openacademy.object', {
 +#             'object': obj
 +#         })
-Index: doc-backend/openacademy/demo.xml
+Index: addons/openacademy/demo.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/demo.xml	2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/demo.xml	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,25 @@
 +<openerp>
 +    <data>
@@ -103,10 +103,10 @@ Index: doc-backend/openacademy/demo.xml
 +        <!--  -->
 +    </data>
 +</openerp>
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/models.py	2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/models.py	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,8 @@
 +# -*- coding: utf-8 -*-
 +
@@ -116,17 +116,17 @@ Index: doc-backend/openacademy/models.py
 +#     _name = 'openacademy.openacademy'
 +
 +#     name = fields.Char()
-Index: doc-backend/openacademy/security/ir.model.access.csv
+Index: addons/openacademy/security/ir.model.access.csv
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/security/ir.model.access.csv	2014-08-24 12:25:30.941397574 +0200
++++ addons/openacademy/security/ir.model.access.csv	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,2 @@
 +id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 +access_openacademy_openacademy,openacademy.openacademy,model_openacademy_openacademy,,1,0,0,0
-Index: doc-backend/openacademy/templates.xml
+Index: addons/openacademy/templates.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/templates.xml	2014-08-24 12:25:18.137397278 +0200
++++ addons/openacademy/templates.xml	2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,22 @@
 +<openerp>
 +    <data>

diff --git a/doc/howtos/backend/exercise-dashboard b/doc/howtos/backend/exercise-dashboard
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 643813940cbea07bec792f9e1c60022a9292fa90
 
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py	2014-08-24 12:31:00.385405199 +0200
-+++ doc-backend/openacademy/__openerp__.py	2014-08-24 12:31:45.373406240 +0200
+--- addons.orig/openacademy/__openerp__.py	2014-08-26 17:26:21.535783052 +0200
++++ addons/openacademy/__openerp__.py	2014-08-26 17:26:21.531783052 +0200
 @@ -21,7 +21,7 @@
      'version': '0.1',
 
@@ -22,11 +22,11 @@ Index: doc-backend/openacademy/__openerp__.py
          'reports.xml',
      ],
      # only loaded in demonstration mode
-Index: doc-backend/openacademy/views/session_board.xml
+Index: addons/openacademy/views/session_board.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/views/session_board.xml	2014-08-24 12:33:16.077408340 +0200
-@@ -0,0 +1,65 @@
++++ addons/openacademy/views/session_board.xml	2014-08-26 17:26:21.531783052 +0200
+@@ -0,0 +1,63 @@
 +<?xml version="1.0"?>
 +<openerp>
 +    <data>
@@ -59,18 +59,16 @@ Index: doc-backend/openacademy/views/session_board.xml
 +                            <action
 +                                string="Attendees by course"
 +                                name="%(act_session_graph)d"
-+                                colspan="4"
 +                                height="150"
 +                                width="510"/>
 +                            <action
 +                                string="Sessions"
-+                                name="%(act_session_calendar)d"
-+                                colspan="4"/>
++                                name="%(act_session_calendar)d"/>
 +                        </column>
 +                        <column>
 +                            <action
 +                                string="Courses"
-+                                name="%(act_course_list)d" colspan="4"/>
++                                name="%(act_course_list)d"/>
 +                        </column>
 +                    </board>
 +                </form>

diff --git a/doc/howtos/backend/exercise-defaults b/doc/howtos/backend/exercise-defaults
@@ -1,7 +1,7 @@
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py	2014-08-24 12:10:34.701376831 +0200
-+++ doc-backend/openacademy/models.py	2014-08-24 12:10:34.693376831 +0200
+--- addons.orig/openacademy/models.py	2014-08-26 17:26:04.727783302 +0200
++++ addons/openacademy/models.py	2014-08-26 17:26:04.719783302 +0200
 @@ -18,9 +18,10 @@
      _name = 'openacademy.session'
 
@@ -14,15 +14,15 @@ Index: doc-backend/openacademy/models.py
 
      instructor_id = fields.Many2one('res.partner', string="Instructor",
          domain=['|', ('instructor', '=', True),
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml	2014-08-24 12:10:34.701376831 +0200
-+++ doc-backend/openacademy/views/openacademy.xml	2014-08-24 12:10:34.693376831 +0200
-@@ -92,6 +92,7 @@
-                         <field name="course_id"/>
-                         <field name="name"/>
-                         <field name="instructor_id"/>
-+                        <field name="active"/>
-                     </group>
-                     <group colspan="2" col="2">
-                         <separator string="Schedule" colspan="2"/>
+--- addons.orig/openacademy/views/openacademy.xml	2014-08-26 17:26:04.727783302 +0200
++++ addons/openacademy/views/openacademy.xml	2014-08-26 17:26:04.719783302 +0200
+@@ -95,6 +95,7 @@
+                                 <field name="course_id"/>
+                                 <field name="name"/>
+                                 <field name="instructor_id"/>
++                                <field name="active"/>
+                             </group>
+                             <group string="Schedule">
+                                 <field name="start_date"/>
diff --git a/doc/howtos/backend/exercise-demo b/doc/howtos/backend/exercise-demo
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 84e2b0b43fc61fd0bcbb44c1929755d44ee58ae5
 
-Index: doc-backend/openacademy/demo.xml
+Index: addons/openacademy/demo.xml
 ===================================================================
---- doc-backend.orig/openacademy/demo.xml	2014-08-24 11:58:31.673360097 +0200
-+++ doc-backend/openacademy/demo.xml	2014-08-24 11:58:49.353360506 +0200
+--- addons.orig/openacademy/demo.xml	2014-08-26 17:25:52.683783480 +0200
++++ addons/openacademy/demo.xml	2014-08-26 17:25:52.679783480 +0200
 @@ -1,25 +1,19 @@
  <openerp>
      <data>