pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] doc: warnings when installing openacademy

Browse Source 
* add _description to openacademy models
* add aria-label to kanban view
* many patches need to be rewritten to unfuzz them

closes odoo/odoo#27617
This commit is contained in:
Xavier Morel
2018-10-10 11:04:37 +00:00
parent 8d9e276a9f
commit 1126485373
22 changed files with 91 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/howtos/backend/exercise-calendar
+2 -2
View File
@@ -12,7 +12,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
from odoo import models, fields, api, exceptions
class Course(models.Model):
@@ -55,6 +56,8 @@ class Session(models.Model):
@@ -57,6 +58,8 @@ class Session(models.Model):
attendee_ids = fields.Many2many('res.partner', string="Attendees")
taken_seats = fields.Float(string="Taken seats", compute='_taken_seats')
@@ -21,7 +21,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
@api.depends('seats', 'attendee_ids')
def _taken_seats(self):
@@ -81,6 +84,30 @@ class Session(models.Model):
@@ -83,6 +86,30 @@ class Session(models.Model):
},
}
doc/howtos/backend/exercise-computed
+1 -1
View File
@@ -5,7 +5,7 @@
diff --git a/openacademy/models.py b/openacademy/models.py
--- a/openacademy/models.py
+++ b/openacademy/models.py
@@ -28,3 +28,13 @@ class Session(models.Model):
@@ -30,3 +30,13 @@ class Session(models.Model):
course_id = fields.Many2one('openacademy.course',
ondelete='cascade', string="Course", required=True)
attendee_ids = fields.Many2many('res.partner', string="Attendees")
doc/howtos/backend/exercise-constraint-python
+1 -1
View File
@@ -13,7 +13,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
class Course(models.Model):
_name = 'openacademy.course'
@@ -56,3 +56,9 @@ class Session(models.Model):
@@ -58,3 +58,9 @@ class Session(models.Model):
'message': "Increase seats or remove excess attendees",
},
}
doc/howtos/backend/exercise-constraint-sql
+3 -3
View File
@@ -3,9 +3,9 @@
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-27 14:19:33.099111181 +0200
+++ addons/openacademy/models.py 2014-08-27 14:20:03.311110732 +0200
@@ -13,6 +13,16 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -14,6 +14,16 @@
session_ids = fields.One2many(
'openacademy.session', 'course_id', string="Sessions")
doc/howtos/backend/exercise-copy-override
+1 -1
View File
@@ -5,7 +5,7 @@
diff --git a/openacademy/models.py b/openacademy/models.py
--- a/openacademy/models.py
+++ b/openacademy/models.py
@@ -13,6 +13,20 @@ class Course(models.Model):
@@ -14,6 +14,20 @@ class Course(models.Model):
session_ids = fields.One2many(
'openacademy.session', 'course_id', string="Sessions")
doc/howtos/backend/exercise-defaults
+6 -6
View File
@@ -1,9 +1,9 @@
Index: addons/openacademy/models.py
===================================================================
--- 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'
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -20,9 +20,10 @@
_description = "OpenAcademy Sessions"
name = fields.Char(required=True)
- start_date = fields.Date()
@@ -16,8 +16,8 @@ Index: addons/openacademy/models.py
domain=['|', ('instructor', '=', True),
Index: addons/openacademy/views/openacademy.xml
===================================================================
--- 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
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -95,6 +95,7 @@
<field name="course_id"/>
<field name="name"/>
doc/howtos/backend/exercise-domain-advanced
+8 -9
View File
@@ -3,9 +3,9 @@
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-26 17:26:02.903783329 +0200
+++ addons/openacademy/models.py 2014-08-26 17:26:02.895783329 +0200
@@ -23,7 +23,8 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -25,7 +25,8 @@
seats = fields.Integer(string="Number of seats")
instructor_id = fields.Many2one('res.partner', string="Instructor",
@@ -17,13 +17,12 @@ Index: addons/openacademy/models.py
attendee_ids = fields.Many2many('res.partner', string="Attendees")
Index: addons/openacademy/views/partner.xml
===================================================================
--- addons.orig/openacademy/views/partner.xml 2014-08-26 17:26:02.903783329 +0200
+++ addons/openacademy/views/partner.xml 2014-08-26 17:26:02.895783329 +0200
@@ -28,5 +28,21 @@
<menuitem id="contact_menu" name="Contacts"
--- addons.orig/openacademy/views/partner.xml
+++ addons/openacademy/views/partner.xml
@@ -29,4 +29,20 @@
parent="configuration_menu"
action="contact_list_action"/>
+
+ <record model="ir.actions.act_window" id="contact_cat_list_action">
+ <field name="name">Contact Tags</field>
+ <field name="res_model">res.partner.category</field>
@@ -39,5 +38,5 @@ Index: addons/openacademy/views/partner.xml
+ <record model="res.partner.category" id="teacher2">
+ <field name="name">Teacher / Level 2</field>
+ </record>
+
</odoo>
doc/howtos/backend/exercise-domain-basic
+3 -3
View File
@@ -3,9 +3,9 @@
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-26 17:26:02.067783341 +0200
+++ addons/openacademy/models.py 2014-08-26 17:26:02.059783341 +0200
@@ -22,7 +22,8 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -24,7 +24,8 @@
duration = fields.Float(digits=(6, 2), help="Duration in days")
seats = fields.Integer(string="Number of seats")
doc/howtos/backend/exercise-gantt
+2 -2
View File
@@ -5,7 +5,7 @@
diff --git a/openacademy/models.py b/openacademy/models.py
--- a/openacademy/models.py
+++ b/openacademy/models.py
@@ -59,6 +59,9 @@ class Session(models.Model):
@@ -61,6 +61,9 @@ class Session(models.Model):
end_date = fields.Date(string="End Date", store=True,
compute='_get_end_date', inverse='_set_end_date')
@@ -15,7 +15,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
@api.depends('seats', 'attendee_ids')
def _taken_seats(self):
for r in self:
@@ -108,6 +111,15 @@ class Session(models.Model):
@@ -110,6 +113,15 @@ class Session(models.Model):
end_date = fields.Datetime.from_string(r.end_date)
r.duration = (end_date - start_date).days + 1
doc/howtos/backend/exercise-graph
+2 -2
View File
@@ -5,7 +5,7 @@
diff --git a/openacademy/models.py b/openacademy/models.py
--- a/openacademy/models.py
+++ b/openacademy/models.py
@@ -62,6 +62,9 @@ class Session(models.Model):
@@ -64,6 +64,9 @@ class Session(models.Model):
hours = fields.Float(string="Duration in hours",
compute='_get_hours', inverse='_set_hours')
@@ -15,7 +15,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
@api.depends('seats', 'attendee_ids')
def _taken_seats(self):
for r in self:
@@ -120,6 +123,11 @@ class Session(models.Model):
@@ -122,6 +125,11 @@ class Session(models.Model):
for r in self:
r.duration = r.hours / 24
doc/howtos/backend/exercise-kanban
+6 -6
View File
@@ -3,9 +3,9 @@
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-28 14:21:58.627015606 +0200
+++ addons/openacademy/models.py 2014-08-28 14:21:58.623015606 +0200
@@ -47,6 +47,7 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -49,6 +49,7 @@
duration = fields.Float(digits=(6, 2), help="Duration in days")
seats = fields.Integer(string="Number of seats")
active = fields.Boolean(default=True)
@@ -15,8 +15,8 @@ Index: addons/openacademy/models.py
domain=['|', ('instructor', '=', True),
Index: addons/openacademy/views/openacademy.xml
===================================================================
--- addons.orig/openacademy/views/openacademy.xml 2014-08-28 14:21:58.627015606 +0200
+++ addons/openacademy/views/openacademy.xml 2014-08-28 14:21:58.623015606 +0200
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -166,11 +166,57 @@
</field>
</record>
@@ -36,7 +36,7 @@ Index: addons/openacademy/views/openacademy.xml
+ <div class="oe_dropdown_kanban">
+ <!-- dropdown menu -->
+ <div class="oe_dropdown_toggle">
+ <i class="fa fa-bars fa-lg"/>
+ <i class="fa fa-bars fa-lg" title="Manage" aria-label="Manage"/>
+ <ul class="oe_dropdown_menu">
+ <li>
+ <a type="delete">Delete</a>
doc/howtos/backend/exercise-many2many
+5 -5
View File
@@ -1,16 +1,16 @@
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-27 10:34:08.531934946 +0200
+++ addons/openacademy/models.py 2014-08-27 10:34:08.527934946 +0200
@@ -25,3 +25,4 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -27,3 +27,4 @@
instructor_id = fields.Many2one('res.partner', string="Instructor")
course_id = fields.Many2one('openacademy.course',
ondelete='cascade', string="Course", required=True)
+ attendee_ids = fields.Many2many('res.partner', string="Attendees")
Index: addons/openacademy/views/openacademy.xml
===================================================================
--- addons.orig/openacademy/views/openacademy.xml 2014-08-27 10:34:08.531934946 +0200
+++ addons/openacademy/views/openacademy.xml 2014-08-27 10:34:08.527934946 +0200
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -102,6 +102,8 @@
<field name="seats"/>
</group>
doc/howtos/backend/exercise-many2one
+6 -6
View File
@@ -3,9 +3,9 @@
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-27 10:37:10.135932250 +0200
+++ addons/openacademy/models.py 2014-08-27 10:37:10.131932250 +0200
@@ -8,6 +8,9 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -9,6 +9,9 @@
name = fields.Char(string="Title", required=True)
description = fields.Text()
@@ -15,7 +15,7 @@ Index: addons/openacademy/models.py
class Session(models.Model):
_name = 'openacademy.session'
@@ -16,3 +19,7 @@
@@ -18,3 +21,7 @@
start_date = fields.Date()
duration = fields.Float(digits=(6, 2), help="Duration in days")
seats = fields.Integer(string="Number of seats")
@@ -25,8 +25,8 @@ Index: addons/openacademy/models.py
+ ondelete='cascade', string="Course", required=True)
Index: addons/openacademy/views/openacademy.xml
===================================================================
--- addons.orig/openacademy/views/openacademy.xml 2014-08-27 10:37:10.135932250 +0200
+++ addons/openacademy/views/openacademy.xml 2014-08-27 10:37:10.131932250 +0200
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -9,6 +9,7 @@
<sheet>
<group>
doc/howtos/backend/exercise-model
+4 -3
View File
@@ -2,9 +2,9 @@
# Parent e3bb12713a6d38c28f50d46e8c1bab74ac40c1be
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-26 17:25:51.643783496 +0200
+++ addons/openacademy/models.py 2014-08-26 17:25:51.639783496 +0200
@@ -2,7 +2,8 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -2,7 +2,9 @@
from odoo import models, fields, api
@@ -12,6 +12,7 @@ Index: addons/openacademy/models.py
-# _name = 'openacademy.openacademy'
+class Course(models.Model):
+ _name = 'openacademy.course'
+ _description = "OpenAcademy Courses"
-# name = fields.Char()
+ name = fields.Char(string="Title", required=True)
doc/howtos/backend/exercise-onchange
+1 -1
View File
@@ -5,7 +5,7 @@
diff --git a/openacademy/models.py b/openacademy/models.py
--- a/openacademy/models.py
+++ b/openacademy/models.py
@@ -39,3 +39,20 @@ class Session(models.Model):
@@ -41,3 +41,20 @@ class Session(models.Model):
r.taken_seats = 0.0
else:
r.taken_seats = 100.0 * len(r.attendee_ids) / r.seats
doc/howtos/backend/exercise-one2many
+5 -5
View File
@@ -3,9 +3,9 @@
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-27 14:18:59.091111685 +0200
+++ addons/openacademy/models.py 2014-08-27 14:19:03.259111624 +0200
@@ -10,6 +10,8 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -11,6 +11,8 @@
responsible_id = fields.Many2one('res.users',
ondelete='set null', string="Responsible", index=True)
@@ -16,8 +16,8 @@ Index: addons/openacademy/models.py
class Session(models.Model):
Index: addons/openacademy/views/openacademy.xml
===================================================================
--- addons.orig/openacademy/views/openacademy.xml 2014-08-27 14:18:59.091111685 +0200
+++ addons/openacademy/views/openacademy.xml 2014-08-27 14:18:59.083111686 +0200
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -15,8 +15,13 @@
<page string="Description">
<field name="description"/>
doc/howtos/backend/exercise-session
+9 -9
View File
@@ -2,9 +2,9 @@
# Parent 22f8d180a7f9ad209d7e98cf7d1bd0fee1f05350
Index: addons/openacademy/models.py
===================================================================
--- addons.orig/openacademy/models.py 2014-08-27 10:35:29.179933749 +0200
+++ addons/openacademy/models.py 2014-08-27 10:35:56.000000000 +0200
@@ -7,3 +7,12 @@
--- addons.orig/openacademy/models.py
+++ addons/openacademy/models.py
@@ -8,3 +8,13 @@
name = fields.Char(string="Title", required=True)
description = fields.Text()
@@ -12,6 +12,7 @@ Index: addons/openacademy/models.py
+
+class Session(models.Model):
+ _name = 'openacademy.session'
+ _description = "OpenAcademy Sessions"
+
+ name = fields.Char(required=True)
+ start_date = fields.Date()
@@ -19,13 +20,12 @@ Index: addons/openacademy/models.py
+ seats = fields.Integer(string="Number of seats")
Index: addons/openacademy/views/openacademy.xml
===================================================================
--- addons.orig/openacademy/views/openacademy.xml 2014-08-27 10:35:29.179933749 +0200
+++ addons/openacademy/views/openacademy.xml 2014-08-27 10:36:54.643932480 +0200
@@ -64,5 +64,34 @@
<!-- Full id location:
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -65,4 +65,33 @@
action="openacademy.course_list_action"
It is not required when it is the same module -->
+
+ <!-- session form view -->
+ <record model="ir.ui.view" id="session_form_view">
+ <field name="name">session.form</field>
@@ -54,5 +54,5 @@ Index: addons/openacademy/views/openacademy.xml
+ <menuitem id="session_menu" name="Sessions"
+ parent="openacademy_menu"
+ action="session_list_action"/>
+
</odoo>
doc/howtos/backend/exercise-translations
+3 -3
View File
@@ -13,7 +13,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
class Course(models.Model):
_name = 'openacademy.course'
@@ -19,11 +19,11 @@ class Course(models.Model):
@@ -20,11 +20,11 @@ class Course(models.Model):
default = dict(default or {})
copied_count = self.search_count(
@@ -28,7 +28,7 @@ diff --git a/openacademy/models.py b/openacademy/models.py
default['name'] = new_name
return super(Course, self).copy(default)
@@ -79,15 +79,15 @@ class Session(models.Model):
@@ -81,15 +81,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
},
}
@@ -133,4 +133,4 @@ class Session(models.Model):
@@ -135,4 +135,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:
doc/howtos/backend/exercise-wizard
+6 -5
View File
@@ -1,7 +1,7 @@
Index: addons/openacademy/__init__.py
===================================================================
--- addons.orig/openacademy/__init__.py 2014-08-27 14:19:23.023111330 +0200
+++ addons/openacademy/__init__.py 2014-08-27 14:22:25.043108628 +0200
--- addons.orig/openacademy/__init__.py
+++ addons/openacademy/__init__.py
@@ -2,3 +2,4 @@
from . import controllers
from . import models
@@ -9,15 +9,16 @@ Index: addons/openacademy/__init__.py
+from . import wizard
Index: addons/openacademy/wizard.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ addons/openacademy/wizard.py 2014-08-27 14:24:39.195106637 +0200
@@ -0,0 +1,10 @@
--- /dev/null
+++ addons/openacademy/wizard.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api
+
+class Wizard(models.TransientModel):
+ _name = 'openacademy.wizard'
+ _description = "Wizard: Quick Registration of Attendees to Sessions"
+
+ session_id = fields.Many2one('openacademy.session',
+ string="Session", required=True)
doc/howtos/backend/exercise-wizard-action
+5 -5
View File
@@ -1,7 +1,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
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -232,6 +232,12 @@
<field name="session_id"/>
<field name="attendee_ids"/>
@@ -17,9 +17,9 @@ Index: addons/openacademy/views/openacademy.xml
</record>
Index: addons/openacademy/wizard.py
===================================================================
--- addons.orig/openacademy/wizard.py 2014-08-28 14:34:19.255004611 +0200
+++ addons/openacademy/wizard.py 2014-08-28 14:34:19.251004612 +0200
@@ -11,3 +11,8 @@
--- addons.orig/openacademy/wizard.py
+++ addons/openacademy/wizard.py
@@ -12,3 +12,8 @@
session_id = fields.Many2one('openacademy.session',
string="Session", required=True, default=_default_session)
attendee_ids = fields.Many2many('res.partner', string="Attendees")
doc/howtos/backend/exercise-wizard-launch
+6 -6
View File
@@ -1,10 +1,10 @@
Index: addons/openacademy/wizard.py
===================================================================
--- addons.orig/openacademy/wizard.py 2014-08-28 14:34:07.879004780 +0200
+++ addons/openacademy/wizard.py 2014-08-28 14:34:07.871004780 +0200
@@ -5,6 +5,9 @@
class Wizard(models.TransientModel):
--- addons.orig/openacademy/wizard.py
+++ addons/openacademy/wizard.py
@@ -6,6 +6,9 @@ class Wizard(models.TransientModel):
_name = 'openacademy.wizard'
_description = "Wizard: Quick Registration of Attendees to Sessions"
+ def _default_session(self):
+ return self.env['openacademy.session'].browse(self._context.get('active_id'))
@@ -15,8 +15,8 @@ Index: addons/openacademy/wizard.py
attendee_ids = fields.Many2many('res.partner', string="Attendees")
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
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -223,4 +223,25 @@
parent="openacademy_menu"
action="session_list_action"/>
doc/howtos/backend/exercise-wizard-multi
+6 -6
View File
@@ -1,7 +1,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
--- addons.orig/openacademy/views/openacademy.xml
+++ addons/openacademy/views/openacademy.xml
@@ -229,7 +229,7 @@
<field name="arch" type="xml">
<form string="Add Attendees">
@@ -13,11 +13,11 @@ Index: addons/openacademy/views/openacademy.xml
<footer>
Index: addons/openacademy/wizard.py
===================================================================
--- addons.orig/openacademy/wizard.py 2014-08-28 14:34:28.583004473 +0200
+++ addons/openacademy/wizard.py 2014-08-28 14:34:28.579004473 +0200
@@ -5,14 +5,15 @@
class Wizard(models.TransientModel):
--- addons.orig/openacademy/wizard.py
+++ addons/openacademy/wizard.py
@@ -6,14 +6,15 @@ class Wizard(models.TransientModel):
_name = 'openacademy.wizard'
_description = "Wizard: Quick Registration of Attendees to Sessions"
- def _default_session(self):
- return self.env['openacademy.session'].browse(self._context.get('active_id'))