[FIX] doc: adapt to removal of workflows
Remove one excerice that was in the workflow section Adapt the diff
This commit is contained in:
@@ -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',
|
||||
|
||||
@@ -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">
|
||||
@@ -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:
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -24,7 +24,6 @@ exercise-searchview
|
||||
exercise-gantt
|
||||
exercise-graph
|
||||
exercise-kanban
|
||||
exercise-state-basic
|
||||
exercise-access-rights
|
||||
exercise-access-rules
|
||||
exercise-wizard
|
||||
|
||||
Reference in New Issue
Block a user