[tryton-debian-vcs] tryton-modules-dashboard branch debian updated. debian/2.8.0-3-4-gfa3f4de
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:34:38 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-dashboard.git;a=commitdiff;h=debian/2.8.0-3-4-gfa3f4de
commit fa3f4de43c86cadbf79769b72838e4832016caa1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:13 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 523b602..7a340a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-dashboard (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:54:07 +0100
+
tryton-modules-dashboard (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit d06f71a3a59e17d0fe90efbf30227f6934764fff
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 082081c..d7d652b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-dashboard.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit aecf755b2d8ac80022b4735b39f5d6a476f418ba
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 69b5f84..082081c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-dashboard.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-dashboard.git
commit 59db8cf9858a395ee4f1f5125481124681309bcd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:18 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 758786e..34f8523 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
* Filter action based on usage "dashboard"
diff --git a/PKG-INFO b/PKG-INFO
index e250673..c583ef9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for dashboard
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_dashboard
=================
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/dashboard.py b/dashboard.py
index ed89c82..406fe05 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -2,7 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.pyson import Eval
__all__ = ['DashboardAction']
@@ -13,9 +13,7 @@ class DashboardAction(ModelSQL, ModelView):
__name__ = "dashboard.action"
user = fields.Many2One('res.user', 'User', required=True,
select=True)
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence')
act_window = fields.Many2One('ir.action.act_window', 'Action',
required=True, ondelete='CASCADE', domain=[
('res_model', '!=', None),
@@ -35,6 +33,7 @@ class DashboardAction(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -42,3 +41,8 @@ class DashboardAction(ModelSQL, ModelView):
# Migration from 2.4: drop required on sequence
table.not_null_action('sequence', action='remove')
+
+ @staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 5e8bc47..929bf0b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -63,14 +63,6 @@ msgid "Square"
msgstr "Carré"
msgctxt "selection:res.user,dashboard_layout:"
-msgid "Square"
-msgstr "Carré"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Bottom"
-msgstr "Pile bas"
-
-msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
msgstr "Pile bas"
@@ -79,14 +71,6 @@ msgid "Stack Left"
msgstr "Pile gauche"
msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Left"
-msgstr "Pile gauche"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Right"
-msgstr "Pile droite"
-
-msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
msgstr "Pile droite"
@@ -94,14 +78,6 @@ msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
msgstr "Pile haut"
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Top"
-msgstr "Pile haut"
-
-msgctxt "view:dashboard.action:"
-msgid "Dashboard Action"
-msgstr "Action tableau de bord"
-
msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
msgstr "Action tableau de bord"
@@ -110,14 +86,6 @@ msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
msgstr "Actions tableau de bord"
-msgctxt "view:dashboard.action:"
-msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
-
-msgctxt "view:res.user:"
-msgid "Dashboard"
-msgstr "Tableau de bord"
-
msgctxt "view:res.user:"
msgid "Dashboard"
msgstr "Tableau de bord"
diff --git a/locale/fr_FR.po b/locale/sl_SI.po
similarity index 54%
copy from locale/fr_FR.po
copy to locale/sl_SI.po
index 5e8bc47..9972b2f 100644
--- a/locale/fr_FR.po
+++ b/locale/sl_SI.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:dashboard.action,act_window:"
msgid "Action"
-msgstr "Action"
+msgstr "Ukrep"
msgctxt "field:dashboard.action,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Ustvarjeno"
msgctxt "field:dashboard.action,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Ustvaril"
msgctxt "field:dashboard.action,id:"
msgid "ID"
@@ -20,104 +20,72 @@ msgstr "ID"
msgctxt "field:dashboard.action,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:dashboard.action,sequence:"
msgid "Sequence"
-msgstr "Séquence"
+msgstr "Zap.št."
msgctxt "field:dashboard.action,user:"
msgid "User"
-msgstr "Utilisateur"
+msgstr "Uporabnik"
msgctxt "field:dashboard.action,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Zapisano"
msgctxt "field:dashboard.action,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Zapisal"
msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
+msgstr "Ukrepi delovne table"
msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
-msgstr "Mise en page de tableau de bord"
+msgstr "Razporeditev delovne table"
msgctxt "model:dashboard.action,name:"
msgid "Dashboard Action"
-msgstr "Action tableau de bord"
+msgstr "Ukrep delovne table"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
-msgstr "Tableau de bord"
+msgstr "Delovna tabla"
msgctxt "model:ir.ui.menu,name:menu_dashboard"
msgid "Dashboard"
-msgstr "Tableau de bord"
+msgstr "Delovna tabla"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Square"
-msgstr "Carré"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Square"
-msgstr "Carré"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Bottom"
-msgstr "Pile bas"
+msgstr "Kvadrat"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
-msgstr "Pile bas"
+msgstr "Zloženo spodaj"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
-msgstr "Pile gauche"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Left"
-msgstr "Pile gauche"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Right"
-msgstr "Pile droite"
+msgstr "Zloženo levo"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
-msgstr "Pile droite"
+msgstr "Zloženo desno"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
-msgstr "Pile haut"
-
-msgctxt "selection:res.user,dashboard_layout:"
-msgid "Stack Top"
-msgstr "Pile haut"
-
-msgctxt "view:dashboard.action:"
-msgid "Dashboard Action"
-msgstr "Action tableau de bord"
+msgstr "Zloženo na vrhu"
msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
-msgstr "Action tableau de bord"
+msgstr "Ukrep delovne table"
msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
-
-msgctxt "view:dashboard.action:"
-msgid "Dashboard Actions"
-msgstr "Actions tableau de bord"
-
-msgctxt "view:res.user:"
-msgid "Dashboard"
-msgstr "Tableau de bord"
+msgstr "Ukrepi delovne table"
msgctxt "view:res.user:"
msgid "Dashboard"
-msgstr "Tableau de bord"
+msgstr "Delovna tabla"
diff --git a/res.py b/res.py
index b3aeb50..bb0e3e8 100644
--- a/res.py
+++ b/res.py
@@ -1,7 +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 fields
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.transaction import Transaction
from trytond.pool import PoolMeta
@@ -31,8 +31,11 @@ class User:
@classmethod
def __register__(cls, module_name):
- super(User, cls).__register__(module_name)
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
+
+ super(User, cls).__register__(module_name)
+
table = TableHandler(cursor, cls, module_name)
# Migration from 1.6
diff --git a/setup.py b/setup.py
index f708acf..c31ad41 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name='trytond_dashboard',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 36d6daf..5ec8ff9 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_dashboard import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index a786003..25d3a0e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
res
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 8b3b10f..adc12d2 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-dashboard
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for dashboard
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_dashboard
=================
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_dashboard.egg-info/SOURCES.txt b/trytond_dashboard.egg-info/SOURCES.txt
index 74b218f..6e08af5 100644
--- a/trytond_dashboard.egg-info/SOURCES.txt
+++ b/trytond_dashboard.egg-info/SOURCES.txt
@@ -25,6 +25,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_dashboard.egg-info/PKG-INFO
trytond_dashboard.egg-info/SOURCES.txt
trytond_dashboard.egg-info/dependency_links.txt
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index 4cdf1bd..b44584b 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,2 @@
lxml
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-dashboard
More information about the tryton-debian-vcs
mailing list