From 2412c68b51b5a247e8d65345470656c89c7c845b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Oct 2011 20:20:22 +0200 Subject: [PATCH 1/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 2c11a66eec..964f4a9274 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Tableau de bord', 'name_nl_NL': 'Prikbord', 'name_ru_RU': 'Информационная панель', - 'version': '2.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d386f54f613ee75833ad8386b0c5834af62c07f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Mar 2012 12:46:01 +0100 Subject: [PATCH 2/9] Fix expand to use xexpand or yexpand (transplanted from 34b45306f90db9ece10bf844e1f9501aaad12a15) --- ir.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/ir.py b/ir.py index 97f2282c7d..5ed179e75a 100644 --- a/ir.py +++ b/ir.py @@ -66,16 +66,20 @@ class View(Model): if group is None: root.append(element) group = etree.Element('group', { - 'col': '1', - }) + 'col': '1', + 'yexpand': '1', + 'yfill': '1', + }) root.append(group) else: group.append(element) elif user.dashboard_layout == 'stack_left': root.set('col', '2') group = etree.Element('group', { - 'col': '1', - }) + 'col': '1', + 'yexpand': '1', + 'yfill': '1', + }) root.append(group) first = True for action in user.dashboard_actions: @@ -88,9 +92,9 @@ class View(Model): elif user.dashboard_layout == 'stack_top': root.set('col', '1') group = etree.Element('group', { - 'col': str(len(user.dashboard_actions) - 1), - 'expand': '1', - }) + 'col': str(len(user.dashboard_actions) - 1), + 'xexpand': '1', + }) root.append(group) first = True for action in user.dashboard_actions: @@ -103,9 +107,9 @@ class View(Model): elif user.dashboard_layout == 'stack_bottom': root.set('col', '1') group = etree.Element('group', { - 'col': str(len(user.dashboard_actions) - 1), - 'expand': '1', - }) + 'col': str(len(user.dashboard_actions) - 1), + 'xexpand': '1', + }) first = True for action in user.dashboard_actions: element = self._dashboard_element_action(action) From f9893838df9e3c8809b8a96ef1d27279ecf7c96a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:09:43 +0200 Subject: [PATCH 3/9] Prepare release 2.2.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8633802a37..d6036fb34a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-24 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 1245dd594c..0650193ff9 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2009-2011 Cédric Krier. +Copyright (C) 2009-2012 Cédric Krier. Copyright (C) 2009-2011 Bertrand Chenal. -Copyright (C) 2009-2011 B2CK SPRL. +Copyright (C) 2009-2012 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From d44aab1d784bb76c5d71ddb7cfa1b7b3d8a5c35d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:09:44 +0200 Subject: [PATCH 4/9] Added tag 2.2.1 for changeset 83422595c599 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5a77f141f6..321d37f624 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ 348ba24dd47fbed3527b4df625345203ab1f10ec 1.8.0 e037ec26748b385014a93507201c4e23ce7a9059 2.0.0 90ba5d041ead63adb3102ada77c6d25ca02f807a 2.2.0 +83422595c59934e830461fe8f20810d044522573 2.2.1 From 5c44218cae16eb9de4e397ee3b3d4bdbed58ca59 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:09:47 +0200 Subject: [PATCH 5/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 964f4a9274..3b5e783508 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Tableau de bord', 'name_nl_NL': 'Prikbord', 'name_ru_RU': 'Информационная панель', - 'version': '2.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From c229ad2d0859f408422e03dac99fcf25d7020763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 4 Feb 2013 19:56:02 +0100 Subject: [PATCH 6/9] Prevent access rule error on act_window review656003 (transplanted from ccbae69cd482628aa4d0114b2842a2684d8d1dfc) --- dashboard.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dashboard.py b/dashboard.py index 9cd4a6295a..af09d607e0 100644 --- a/dashboard.py +++ b/dashboard.py @@ -1,6 +1,7 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. from trytond.model import ModelView, ModelSQL, fields +from trytond.pyson import Eval class DashboardAction(ModelSQL, ModelView): @@ -14,6 +15,11 @@ class DashboardAction(ModelSQL, ModelView): required=True, ondelete='CASCADE', domain=[ ('res_model', '!=', False), ('res_model', '!=', ''), + # XXX copy ir.action rule to prevent access rule error + ['OR', + ('groups', 'in', Eval('context', {}).get('groups', [])), + ('groups', '=', None), + ], ]) def __init__(self): From 475b55c110984da6ea7acfc2c7982811c2d7dc1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:09:34 +0100 Subject: [PATCH 7/9] Prepare release 2.2.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d6036fb34a..11702915b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.2 - 2013-02-12 +* Bug fixes (see mercurial logs for details) + Version 2.2.1 - 2012-05-07 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 0650193ff9..bd944d1fb1 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2009-2012 Cédric Krier. +Copyright (C) 2009-2013 Cédric Krier. Copyright (C) 2009-2011 Bertrand Chenal. -Copyright (C) 2009-2012 B2CK SPRL. +Copyright (C) 2009-2013 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 1ecd5a9c41a78709714dae0ca267c14e84e4c02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:09:35 +0100 Subject: [PATCH 8/9] Added tag 2.2.2 for changeset 800399ceb85e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 321d37f624..0b7e0c5a6e 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ e037ec26748b385014a93507201c4e23ce7a9059 2.0.0 90ba5d041ead63adb3102ada77c6d25ca02f807a 2.2.0 83422595c59934e830461fe8f20810d044522573 2.2.1 +800399ceb85e3e64d8631d1dd2223f45cd8944b5 2.2.2 From 212b8c65f059a2628cd7beed4752cd547ac02e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:09:47 +0100 Subject: [PATCH 9/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 3b5e783508..9ef6a127f7 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Tableau de bord', 'name_nl_NL': 'Prikbord', 'name_ru_RU': 'Информационная панель', - 'version': '2.2.2', + 'version': '2.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',