[tryton-debian-vcs] tryton-modules-dashboard branch upstream-2.2 created. 5819e89851d44f77de1f9f200894249a8d7471b3
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:02:05 UTC 2013
The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-dashboard.git;a=commitdiff;h=5819e89851d44f77de1f9f200894249a8d7471b3
commit 5819e89851d44f77de1f9f200894249a8d7471b3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:16 2013 +0100
Adding upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index d6036fb..1170291 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 0650193..bd944d1 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
diff --git a/PKG-INFO b/PKG-INFO
index 9a39a62..e0ddab2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 2.2.1
+Version: 2.2.2
Summary: Dashboard:
- Allow to create a personalized dashboard.
diff --git a/__tryton__.py b/__tryton__.py
index 964f4a9..3b5e783 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 at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/dashboard.py b/dashboard.py
index 9cd4a62..af09d60 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):
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 1a845d4..bb0fb95 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-dashboard
-Version: 2.2.1
+Version: 2.2.2
Summary: Dashboard:
- Allow to create a personalized dashboard.
commit 8a650be6f71620c200985220e3370cd3fede4d38
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 12:01:16 2012 +0200
Adding upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 8633802..d6036fb 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 1245dd5..0650193 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
diff --git a/PKG-INFO b/PKG-INFO
index efc2fa7..9a39a62 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 2.2.0
+Version: 2.2.1
Summary: Dashboard:
- Allow to create a personalized dashboard.
diff --git a/__tryton__.py b/__tryton__.py
index 2c11a66..964f4a9 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 at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/ir.py b/ir.py
index 97f2282..5ed179e 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)
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 500ec9b..1a845d4 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-dashboard
-Version: 2.2.0
+Version: 2.2.1
Summary: Dashboard:
- Allow to create a personalized dashboard.
--
tryton-modules-dashboard
More information about the tryton-debian-vcs
mailing list