[tryton-debian-vcs] tryton-modules-dashboard branch debian-wheezy-2.2 created. 2dc32024413600af75b560b99463253e8d77fa45
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:02:04 UTC 2013
The following commit has been merged in the debian-wheezy-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-dashboard.git;a=commitdiff;h=2dc32024413600af75b560b99463253e8d77fa45
commit 2dc32024413600af75b560b99463253e8d77fa45
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:26 2013 +0100
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 81e8d35..ae8e67d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-dashboard (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 24 Feb 2013 22:11:26 +0100
+
tryton-modules-dashboard (2.2.1-2) unstable; urgency=low
* Updating maintainers field.
commit ac9ce0fce5cffd2802832cf922d25dc5ed36e216
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:09:31 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index aa54b57..7b427f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2009-2012 Cedric Krier
+Copyright: 2009-2013 Cédric Krier
2009-2011 Bertrand Chenal
- 2009-2012 B2CK SPRL
+ 2009-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 05f7562a33d04d9119e2e769614b10e9bc0f55a6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:47 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index a1b86c8..147d5a7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit 977ab6dc36ec447cab5b5fdf128f665ea766c60d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:09 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 9438d2b..a1b86c8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-dashboard.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-dashboard.git
commit fc669ff739f0c5f568d7835978d62353f1aa7f5d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:17 2013 +0100
Merging 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 6a6c5fe995dbed4cff07e9827fe7d38649689ff7
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:17:44 2012 +0200
Releasing debian version 2.2.1-2.
diff --git a/debian/changelog b/debian/changelog
index 5ee95a5..81e8d35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-dashboard (2.2.1-2) unstable; urgency=low
+
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 30 Jun 2012 18:17:39 +0200
+
tryton-modules-dashboard (2.2.1-1) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 049b44ccb6c0eb6b6e420a217ae85472b8e6e951
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:28 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 459b5ab..9438d2b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-dashboard.git
commit 80f145b0e62446f45b2f16ef06bad317ad6da886
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 51a316e39c4e03049ab7cfd0949d187abc8a8abb
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 0564214..aa54b57 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2009-2012 Cedric Krier
- (C) 2009-2011 Bertrand Chenal
- (C) 2009-2012 B2CK SPRL
+ 2009-2012 Cedric Krier
+ 2009-2011 Bertrand Chenal
+ 2009-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2010-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2010-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit de14240b490572b29999948b3af1736a5489ba79
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 5e26873..459b5ab 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-dashboard.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-dashboard.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-dashboard.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-dashboard.git
X-Python-Version: >= 2.6
Package: tryton-modules-dashboard
commit f356f1176094f092cc15e2cbe9044091526f2c4a
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:30 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 854dc10..5e26873 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-dashboard
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 65913b05067962e77518299df1ab1cfc15644d25
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 13:12:35 2012 +0200
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index e2f1cad..5ee95a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-dashboard (2.2.1-1) unstable; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.2.1.
+ * Updating years in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 09 May 2012 12:05:41 +0200
+
tryton-modules-dashboard (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit 6db90013d3d30299fee9a285396fabf016ea66f7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 12:05:35 2012 +0200
Updating years in copyright.
diff --git a/debian/copyright b/debian/copyright
index 6f4de75..0564214 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2009-2011 Cedric Krier
+ (C) 2009-2012 Cedric Krier
(C) 2009-2011 Bertrand Chenal
- (C) 2009-2011 B2CK SPRL
+ (C) 2009-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 04e14af4a3e1f06c66f2a1dabaa58edf0270b54c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 12:01:16 2012 +0200
Merging 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