From 1d3d665f2c60f9cdce78b1c6198a83c954085a2e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 14 Jul 2017 10:37:09 +0200 Subject: [PATCH] [FIX] doc: adapt to removal of workflows Remove one excerice that was in the workflow section Adapt the diff --- doc/howtos/backend/exercise-dashboard | 1 + doc/howtos/backend/exercise-state-basic | 55 ----------------------- doc/howtos/backend/exercise-translations | 4 +- doc/howtos/backend/exercise-wizard-action | 2 +- doc/howtos/backend/exercise-wizard-launch | 2 +- doc/howtos/backend/exercise-wizard-multi | 2 +- doc/howtos/backend/series | 1 - 7 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 doc/howtos/backend/exercise-state-basic diff --git a/doc/howtos/backend/exercise-dashboard b/doc/howtos/backend/exercise-dashboard index 91bc239dd7a..6d0aa53fd83 100644 --- a/doc/howtos/backend/exercise-dashboard +++ b/doc/howtos/backend/exercise-dashboard @@ -15,6 +15,7 @@ Index: addons/openacademy/__manifest__.py # always loaded 'data': [ @@ -31,6 +31,7 @@ + 'templates.xml', 'views/openacademy.xml', 'views/partner.xml', + 'views/session_board.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 @@ - openacademy.session - -
-+
-+
-+ - - - 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 @@ diff --git a/doc/howtos/backend/exercise-wizard-launch b/doc/howtos/backend/exercise-wizard-launch index d864eef3f87..340545ededa 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 @@ 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 @@ 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