NeoAnd/knowledge
1
0
Fork 0
mirror of https://github.com/OCA/knowledge.git synced 2025-07-25 01:48:41 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge PR #284 into 12.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot 2021-02-23 07:20:21 +00:00
commit 673729268b
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
document_page_approval/models/document_page_history.py
View File

@ -85,7 +85,7 @@ class DocumentPageHistory(models.Model):
users = self.env['res.users'].search([ users = self.env['res.users'].search([
('groups_id', 'in', guids), ('groups_id', 'in', guids),
('groups_id', 'in', approver_gid.id)]) ('groups_id', 'in', approver_gid.id)])
rec.message_subscribe([u.id for u in users]) rec.message_subscribe(partner_ids=users.mapped('partner_id').ids)
rec.message_post_with_template(template.id) rec.message_post_with_template(template.id)
else: else:
# auto-approve if approval is not required # auto-approve if approval is not required

6
document_page_approval/readme/CONTRIBUTORS.rst
View File

@ -3,4 +3,8 @@
* Gervais Naoussi <gervaisnaoussi@gmail.com> * Gervais Naoussi <gervaisnaoussi@gmail.com>
* Maxime Chambreuil <mchambreuil@opensourceintegrators.com> * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
* Iván Todorovich <ivan.todorovich@gmail.com> * Iván Todorovich <ivan.todorovich@gmail.com>
* Victor M.M. Torres <victor.martin@tecnativa.com>
* `Tecnativa <https://www.tecnativa.com>`_:
* Victor M.M. Torres
* Víctor Martínez

19
document_page_approval/tests/test_document_page_approval.py
View File

@ -15,6 +15,22 @@ class TestDocumentPageApproval(common.TransactionCase):
self.env.ref('base.user_root').write({ self.env.ref('base.user_root').write({
'groups_id': [(4, self.approver_gid.id)], 'groups_id': [(4, self.approver_gid.id)],
}) })
self.user2 = self.env["res.users"].create(
{
"name": "Test user 2",
"login": "Test user 2",
"groups_id": [
(
6,
0,
[
self.env.ref("base.group_user").id,
self.approver_gid.id,
],
)
],
}
)
# demo_approval # demo_approval
self.category2 = self.page_obj.create({ self.category2 = self.page_obj.create({
'name': 'This category requires approval', 'name': 'This category requires approval',
@ -43,6 +59,9 @@ class TestDocumentPageApproval(common.TransactionCase):
# It should automatically be in 'to approve' state # It should automatically be in 'to approve' state
self.assertEqual(chreq.state, 'to approve') self.assertEqual(chreq.state, 'to approve')
user_root = self.env.ref('base.user_root')
self.assertTrue(user_root.partner_id.id in chreq.message_partner_ids.ids)
self.assertTrue(self.user2.partner_id.id in chreq.message_partner_ids.ids)
self.assertNotEqual(chreq.content, page.content) self.assertNotEqual(chreq.content, page.content)
# who_am_i # who_am_i