summaryrefslogtreecommitdiff
path: root/doc/howtos
diff options
context:
space:
mode:
Diffstat (limited to 'doc/howtos')
-rw-r--r--doc/howtos/backend/exercise-dashboard7
-rw-r--r--doc/howtos/backend/exercise-report15
-rw-r--r--doc/howtos/backend/exercise-state-basic55
-rw-r--r--doc/howtos/backend/exercise-translations4
-rw-r--r--doc/howtos/backend/exercise-wizard-action2
-rw-r--r--doc/howtos/backend/exercise-wizard-launch2
-rw-r--r--doc/howtos/backend/exercise-wizard-multi2
-rw-r--r--doc/howtos/backend/series1
8 files changed, 23 insertions, 65 deletions
diff --git a/doc/howtos/backend/exercise-dashboard b/doc/howtos/backend/exercise-dashboard
index eda27131096..d876e37c12e 100644
--- a/doc/howtos/backend/exercise-dashboard
+++ b/doc/howtos/backend/exercise-dashboard
@@ -9,12 +9,13 @@ Index: addons/openacademy/__manifest__.py
'version': '0.1',
# any module necessary for this one to work correctly
-- 'depends': ['base'],
-+ 'depends': ['base', 'board'],
+- 'depends': ['base', 'report'],
++ 'depends': ['base', 'report', 'board'],
# always loaded
'data': [
-@@ -31,6 +31,7 @@
+@@ -30,6 +30,7 @@
+ 'templates.xml',
'views/openacademy.xml',
'views/partner.xml',
+ 'views/session_board.xml',
diff --git a/doc/howtos/backend/exercise-report b/doc/howtos/backend/exercise-report
index 2f8b5dfe5e8..4492eb0f087 100644
--- a/doc/howtos/backend/exercise-report
+++ b/doc/howtos/backend/exercise-report
@@ -3,9 +3,22 @@
Index: addons/openacademy/__manifest__.py
===================================================================
+--- addons.orig/openacademy/__manifest__.py 2014-08-26 17:26:21.535783052 +0200
++++ addons/openacademy/__manifest__.py 2014-08-26 17:26:21.531783052 +0200
+@@ -21,7 +21,7 @@
+ 'version': '0.1',
+
+ # any module necessary for this one to work correctly
+- 'depends': ['base'],
++ 'depends': ['base', 'report'],
+
+ # always loaded
+ 'data': [
+Index: addons/openacademy/__manifest__.py
+===================================================================
--- addons.orig/openacademy/__manifest__.py 2014-08-29 08:39:43.975536806 +0200
+++ addons/openacademy/__manifest__.py 2014-08-29 08:39:52.000000000 +0200
-@@ -31,6 +31,7 @@
+@@ -30,6 +30,7 @@
'templates.xml',
'views/openacademy.xml',
'views/partner.xml',
diff --git a/doc/howtos/backend/exercise-state-basic b/doc/howtos/backend/exercise-state-basic
deleted file mode 100644
index f70a41b4dae..00000000000
--- a/doc/howtos/backend/exercise-state-basic
+++ /dev/null
@@ -1,55 +0,0 @@
-# HG changeset patch
-# Parent 8c721171aa16a41e94059f53d6780c67b5ef2dfc
-# Parent 8d2ca42b5be2031ea9624896df53f09f7ca131be
-
-diff --git a/openacademy/models.py b/openacademy/models.py
---- a/openacademy/models.py
-+++ b/openacademy/models.py
-@@ -66,6 +66,24 @@ class Session(models.Model):
- attendees_count = fields.Integer(
- string="Attendees count", compute='_get_attendees_count', store=True)
-
-+ state = fields.Selection([
-+ ('draft', "Draft"),
-+ ('confirmed', "Confirmed"),
-+ ('done', "Done"),
-+ ], default='draft')
-+
-+ @api.multi
-+ def action_draft(self):
-+ self.state = 'draft'
-+
-+ @api.multi
-+ def action_confirm(self):
-+ self.state = 'confirmed'
-+
-+ @api.multi
-+ def action_done(self):
-+ self.state = 'done'
-+
- @api.depends('seats', 'attendee_ids')
- def _taken_seats(self):
- for r in self:
-diff --git a/openacademy/views/openacademy.xml b/openacademy/views/openacademy.xml
---- a/openacademy/views/openacademy.xml
-+++ b/openacademy/views/openacademy.xml
-@@ -96,6 +96,19 @@
- <field name="model">openacademy.session</field>
- <field name="arch" type="xml">
- <form string="Session Form">
-+ <header>
-+ <button name="action_draft" type="object"
-+ string="Reset to draft"
-+ states="confirmed,done"/>
-+ <button name="action_confirm" type="object"
-+ string="Confirm" states="draft"
-+ class="oe_highlight"/>
-+ <button name="action_done" type="object"
-+ string="Mark as done" states="confirmed"
-+ class="oe_highlight"/>
-+ <field name="state" widget="statusbar"/>
-+ </header>
-+
- <sheet>
- <group>
- <group string="General">
diff --git a/doc/howtos/backend/exercise-translations b/doc/howtos/backend/exercise-translations
index 8ade655253d..e7dfe53ebb7 100644
--- a/doc/howtos/backend/exercise-translations
+++ b/doc/howtos/backend/exercise-translations
@@ -28,7 +28,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
default['name'] = new_name
return super(Course, self).copy(default)
-@@ -97,15 +97,15 @@ class Session(models.Model):
+@@ -79,15 +79,15 @@ class Session(models.Model):
if self.seats < 0:
return {
'warning': {
@@ -48,7 +48,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
},
}
-@@ -151,4 +151,4 @@ class Session(models.Model):
+@@ -133,4 +133,4 @@ class Session(models.Model):
def _check_instructor_not_in_attendees(self):
for r in self:
if r.instructor_id and r.instructor_id in r.attendee_ids:
diff --git a/doc/howtos/backend/exercise-wizard-action b/doc/howtos/backend/exercise-wizard-action
index 3bc20624ee9..23d6a0f2667 100644
--- a/doc/howtos/backend/exercise-wizard-action
+++ b/doc/howtos/backend/exercise-wizard-action
@@ -2,7 +2,7 @@ Index: addons/openacademy/views/openacademy.xml
===================================================================
--- addons.orig/openacademy/views/openacademy.xml 2014-08-28 14:34:19.255004611 +0200
+++ addons/openacademy/views/openacademy.xml 2014-08-28 14:34:19.251004612 +0200
-@@ -248,6 +248,12 @@
+@@ -234,6 +234,12 @@
<field name="session_id"/>
<field name="attendee_ids"/>
</group>
diff --git a/doc/howtos/backend/exercise-wizard-launch b/doc/howtos/backend/exercise-wizard-launch
index 49b1c09191e..7b5d65c8074 100644
--- a/doc/howtos/backend/exercise-wizard-launch
+++ b/doc/howtos/backend/exercise-wizard-launch
@@ -17,7 +17,7 @@ Index: addons/openacademy/views/openacademy.xml
===================================================================
--- addons.orig/openacademy/views/openacademy.xml 2014-08-28 14:34:07.879004780 +0200
+++ addons/openacademy/views/openacademy.xml 2014-08-28 14:34:07.871004780 +0200
-@@ -237,5 +237,26 @@
+@@ -224,5 +224,26 @@
<menuitem id="session_menu" name="Sessions"
parent="openacademy_menu"
action="session_list_action"/>
diff --git a/doc/howtos/backend/exercise-wizard-multi b/doc/howtos/backend/exercise-wizard-multi
index dc99dba2e31..f8ece675090 100644
--- a/doc/howtos/backend/exercise-wizard-multi
+++ b/doc/howtos/backend/exercise-wizard-multi
@@ -2,7 +2,7 @@ Index: addons/openacademy/views/openacademy.xml
===================================================================
--- addons.orig/openacademy/views/openacademy.xml 2014-08-28 14:34:28.583004473 +0200
+++ addons/openacademy/views/openacademy.xml 2014-08-28 14:34:28.579004473 +0200
-@@ -245,7 +245,7 @@
+@@ -231,7 +231,7 @@
<field name="arch" type="xml">
<form string="Add Attendees">
<group>
diff --git a/doc/howtos/backend/series b/doc/howtos/backend/series
index 36627e4eadd..e48d05914e9 100644
--- a/doc/howtos/backend/series
+++ b/doc/howtos/backend/series
@@ -24,7 +24,6 @@ exercise-searchview
exercise-gantt
exercise-graph
exercise-kanban
-exercise-state-basic
exercise-access-rights
exercise-access-rules
exercise-wizard