From e3604edc7c2b46ffb645955b1a55e4c2c5c8a47f Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 7 Jul 2014 12:41:48 +0200 Subject: [PATCH 1/5] add standard files --- .coveragerc | 19 ++++++++++++++++++ .gitignore | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 22 +++++++++++++++++++++ README.md | 12 ++++++++++++ 4 files changed, 109 insertions(+) create mode 100644 .coveragerc create mode 100644 .gitignore create mode 100644 .travis.yml create mode 100644 README.md diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 00000000..a06f8bfe --- /dev/null +++ b/.coveragerc @@ -0,0 +1,19 @@ +# Config file .coveragerc + +[report] +omit = + /usr/* + */bin/* + */lib/* + */odoo/* + */openerp/* + */tests/* + *__init__.py + +# Regexes for lines to exclude from consideration +exclude_lines = + # Have to re-enable the standard pragma + pragma: no cover + + # Don't complain about null context checking + if context is None: diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..890ff010 --- /dev/null +++ b/.gitignore @@ -0,0 +1,56 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +bin/ +build/ +develop-eggs/ +dist/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo + +# Pycharm +.idea + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Rope +.ropeproject + +# Sphinx documentation +docs/_build/ + +# Backup files +*~ +*.swp diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..b89afea2 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: python +python: + - "2.7" + +virtualenv: + system_site_packages: true + +install: + - git clone https://github.com/gurneyalex/maintainer-quality-tools.git $HOME/maintainer-quality-tools + - export PATH=$HOME/maintainer-quality-tools/travis:$PATH + - $HOME/maintainer-quality-tools/travis/travis_install_nightly 7.0 + - pip install coveralls flake8 + +services: + - postgresql + +script: + - travis_run_flake8 + - travis_run_tests 7.0 openerp_test + +after_success: + coveralls diff --git a/README.md b/README.md new file mode 100644 index 00000000..df3f2a6c --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +[![Build Status](https://travis-ci.org/OCA/web.svg?branch=master)](https://travis-ci.org/OCA/web) +[![Coverage Status](https://img.shields.io/coveralls/OCA/web.svg)](https://coveralls.io/r/OCA/web?branch=master) + +Web addons for Odoo +=================== + +This project aims to deal with modules related to the webclient of Odoo. You'll find modules that: + +- Add facilities to the UI +- Add widgets +- Ease the import/export features +- Generally add clientside functionality From 381f08d6bed71ec45525aa90c27ced4fa3c7dbab Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 7 Jul 2014 12:45:55 +0200 Subject: [PATCH 2/5] [FIX] image urls --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index df3f2a6c..d88df981 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Build Status](https://travis-ci.org/OCA/web.svg?branch=master)](https://travis-ci.org/OCA/web) -[![Coverage Status](https://img.shields.io/coveralls/OCA/web.svg)](https://coveralls.io/r/OCA/web?branch=master) +[![Build Status](https://travis-ci.org/OCA/web.svg?branch=7.0)](https://travis-ci.org/OCA/web) +[![Coverage Status](https://img.shields.io/coveralls/OCA/web.svg)](https://coveralls.io/r/OCA/web?branch=7.0) Web addons for Odoo =================== From 4b2fa3ac42c5b5fa03e9c7a1dd2335050b199a84 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 7 Jul 2014 14:40:03 +0200 Subject: [PATCH 3/5] [FIX] flake8 --- web_ckeditor4/__init__.py | 1 - web_ckeditor4/__openerp__.py | 108 +++++++++--------- web_color/__init__.py | 8 +- web_color/__openerp__.py | 14 +-- web_export_view/__init__.py | 2 +- web_ir_actions_act_window_page/__openerp__.py | 16 +-- web_m2x_options/__openerp__.py | 11 +- web_nocreatedb/__openerp__.py | 6 +- web_search_alphabetic/__openerp__.py | 6 +- web_send_message_popup/__openerp__.py | 31 +++-- web_widget_float_formula/__openerp__.py | 6 +- 11 files changed, 102 insertions(+), 107 deletions(-) diff --git a/web_ckeditor4/__init__.py b/web_ckeditor4/__init__.py index a97ee816..fae962cc 100644 --- a/web_ckeditor4/__init__.py +++ b/web_ckeditor4/__init__.py @@ -19,4 +19,3 @@ # along with this program. If not, see . # ############################################################################## - diff --git a/web_ckeditor4/__openerp__.py b/web_ckeditor4/__openerp__.py index 6465c7e7..7d4ab481 100644 --- a/web_ckeditor4/__openerp__.py +++ b/web_ckeditor4/__openerp__.py @@ -51,60 +51,60 @@ #cd trunk #git checkout remotes/origin/release/4.1.x #and uncomment the lines below -# 'static/lib/trunk/ckeditor.js', -# 'static/lib/trunk/core/event.js', -# 'static/lib/trunk/core/editor_basic.js', -# 'static/lib/trunk/core/env.js', -# 'static/lib/trunk/core/ckeditor_basic.js', -# 'static/lib/trunk/core/dom.js', -# 'static/lib/trunk/core/tools.js', -# 'static/lib/trunk/core/dtd.js', -# 'static/lib/trunk/core/dom/event.js', -# 'static/lib/trunk/core/dom/domobject.js', -# 'static/lib/trunk/core/dom/node.js', -# 'static/lib/trunk/core/dom/window.js', -# 'static/lib/trunk/core/dom/document.js', -# 'static/lib/trunk/core/dom/nodelist.js', -# 'static/lib/trunk/core/dom/element.js', -# 'static/lib/trunk/core/dom/documentfragment.js', -# 'static/lib/trunk/core/dom/walker.js', -# 'static/lib/trunk/core/dom/range.js', -# 'static/lib/trunk/core/dom/iterator.js', -# 'static/lib/trunk/core/command.js', -# 'static/lib/trunk/core/ckeditor_base.js', -# 'static/lib/trunk/core/config.js', -# 'static/lib/trunk/core/filter.js', -# 'static/lib/trunk/core/focusmanager.js', -# 'static/lib/trunk/core/keystrokehandler.js', -# 'static/lib/trunk/core/lang.js', -# 'static/lib/trunk/core/scriptloader.js', -# 'static/lib/trunk/core/resourcemanager.js', -# 'static/lib/trunk/core/plugins.js', -# 'static/lib/trunk/core/ui.js', -# 'static/lib/trunk/core/editor.js', -# 'static/lib/trunk/core/htmlparser.js', -# 'static/lib/trunk/core/htmlparser/basicwriter.js', -# 'static/lib/trunk/core/htmlparser/node.js', -# 'static/lib/trunk/core/htmlparser/comment.js', -# 'static/lib/trunk/core/htmlparser/text.js', -# 'static/lib/trunk/core/htmlparser/cdata.js', -# 'static/lib/trunk/core/htmlparser/fragment.js', -# 'static/lib/trunk/core/htmlparser/filter.js', -# 'static/lib/trunk/core/htmldataprocessor.js', -# 'static/lib/trunk/core/htmlparser/element.js', -# 'static/lib/trunk/core/template.js', -# 'static/lib/trunk/core/ckeditor.js', -# 'static/lib/trunk/core/creators/inline.js', -# 'static/lib/trunk/core/creators/themedui.js', -# 'static/lib/trunk/core/editable.js', -# 'static/lib/trunk/core/selection.js', -# 'static/lib/trunk/core/style.js', -# 'static/lib/trunk/core/dom/comment.js', -# 'static/lib/trunk/core/dom/elementpath.js', -# 'static/lib/trunk/core/dom/text.js', -# 'static/lib/trunk/core/dom/rangelist.js', -# 'static/lib/trunk/core/skin.js', -# 'static/lib/trunk/core/_bootstrap.js', + #'static/lib/trunk/ckeditor.js', + #'static/lib/trunk/core/event.js', + #'static/lib/trunk/core/editor_basic.js', + #'static/lib/trunk/core/env.js', + #'static/lib/trunk/core/ckeditor_basic.js', + #'static/lib/trunk/core/dom.js', + #'static/lib/trunk/core/tools.js', + #'static/lib/trunk/core/dtd.js', + #'static/lib/trunk/core/dom/event.js', + #'static/lib/trunk/core/dom/domobject.js', + #'static/lib/trunk/core/dom/node.js', + #'static/lib/trunk/core/dom/window.js', + #'static/lib/trunk/core/dom/document.js', + #'static/lib/trunk/core/dom/nodelist.js', + #'static/lib/trunk/core/dom/element.js', + #'static/lib/trunk/core/dom/documentfragment.js', + #'static/lib/trunk/core/dom/walker.js', + #'static/lib/trunk/core/dom/range.js', + #'static/lib/trunk/core/dom/iterator.js', + #'static/lib/trunk/core/command.js', + #'static/lib/trunk/core/ckeditor_base.js', + #'static/lib/trunk/core/config.js', + #'static/lib/trunk/core/filter.js', + #'static/lib/trunk/core/focusmanager.js', + #'static/lib/trunk/core/keystrokehandler.js', + #'static/lib/trunk/core/lang.js', + #'static/lib/trunk/core/scriptloader.js', + #'static/lib/trunk/core/resourcemanager.js', + #'static/lib/trunk/core/plugins.js', + #'static/lib/trunk/core/ui.js', + #'static/lib/trunk/core/editor.js', + #'static/lib/trunk/core/htmlparser.js', + #'static/lib/trunk/core/htmlparser/basicwriter.js', + #'static/lib/trunk/core/htmlparser/node.js', + #'static/lib/trunk/core/htmlparser/comment.js', + #'static/lib/trunk/core/htmlparser/text.js', + #'static/lib/trunk/core/htmlparser/cdata.js', + #'static/lib/trunk/core/htmlparser/fragment.js', + #'static/lib/trunk/core/htmlparser/filter.js', + #'static/lib/trunk/core/htmldataprocessor.js', + #'static/lib/trunk/core/htmlparser/element.js', + #'static/lib/trunk/core/template.js', + #'static/lib/trunk/core/ckeditor.js', + #'static/lib/trunk/core/creators/inline.js', + #'static/lib/trunk/core/creators/themedui.js', + #'static/lib/trunk/core/editable.js', + #'static/lib/trunk/core/selection.js', + #'static/lib/trunk/core/style.js', + #'static/lib/trunk/core/dom/comment.js', + #'static/lib/trunk/core/dom/elementpath.js', + #'static/lib/trunk/core/dom/text.js', + #'static/lib/trunk/core/dom/rangelist.js', + #'static/lib/trunk/core/skin.js', + #'static/lib/trunk/core/_bootstrap.js', #end of ckeditor debug 'static/src/js/web_ckeditor4.js', ], diff --git a/web_color/__init__.py b/web_color/__init__.py index 7618af68..9f3aa30b 100644 --- a/web_color/__init__.py +++ b/web_color/__init__.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################ -# +# # OpenERP, Open Source Web Color # Copyright (C) 2012 Savoir-faire Linux (). # @@ -15,8 +15,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# along with this program. If not, see . +# # @author Étienne Beaudry Auger # -############################################################################## \ No newline at end of file +############################################################################## diff --git a/web_color/__openerp__.py b/web_color/__openerp__.py index 9981c5dd..99d1ea27 100644 --- a/web_color/__openerp__.py +++ b/web_color/__openerp__.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################ -# +# # OpenERP, Open Source Web Color # Copyright (C) 2012 Savoir-faire Linux (). # @@ -15,15 +15,15 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# along with this program. If not, see . +# # @author Étienne Beaudry Auger # ############################################################################## { 'name': "Web Color", 'author': "Savoir-faire Linux", - 'category' : "Hidden", + 'category': "Hidden", 'description': """ This module provides a color widget to display the color from the hexadecimal value of your field. @@ -31,14 +31,14 @@ 'version': "1.0", 'depends': ['web'], 'js': [ - 'static/src/js/lib.js', + 'static/src/js/lib.js', 'static/lib/really-simple-color-picker/jquery.colorPicker.js', ], 'css': [ 'static/src/css/color.css', 'static/lib/really-simple-color-picker/colorPicker.css', - ], - 'qweb' : ['static/src/xml/lib.xml'], + ], + 'qweb': ['static/src/xml/lib.xml'], 'installable': True, 'auto_install': False, 'web_preload': False, diff --git a/web_export_view/__init__.py b/web_export_view/__init__.py index 09691964..994ad368 100644 --- a/web_export_view/__init__.py +++ b/web_export_view/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # Copyright (C) 2012 Agile Business Group sagl () # Copyright (C) 2012 Domsense srl () # diff --git a/web_ir_actions_act_window_page/__openerp__.py b/web_ir_actions_act_window_page/__openerp__.py index 31054808..6e9fb90e 100644 --- a/web_ir_actions_act_window_page/__openerp__.py +++ b/web_ir_actions_act_window_page/__openerp__.py @@ -19,9 +19,9 @@ # ############################################################################## { - "name" : "Window actions for client side paging", - "version" : "1.0", - "author" : "Therp BV", + "name": "Window actions for client side paging", + "version": "1.0", + "author": "Therp BV", "complexity": "normal", "description": """ Client side paging @@ -37,10 +37,10 @@ or:: which trigger the form's controller to page into the requested direction. """, - "category" : "Dependency", - "depends" : [ + "category": "Dependency", + "depends": [ ], - "data" : [ + "data": [ ], "js": [ 'static/src/js/web_ir_actions_act_window_page.js', @@ -51,7 +51,7 @@ which trigger the form's controller to page into the requested direction. ], "auto_install": False, "installable": True, - "external_dependencies" : { - 'python' : [], + "external_dependencies": { + 'python': [], }, } diff --git a/web_m2x_options/__openerp__.py b/web_m2x_options/__openerp__.py index f428885e..b62bc3f0 100644 --- a/web_m2x_options/__openerp__.py +++ b/web_m2x_options/__openerp__.py @@ -3,8 +3,7 @@ { "name": 'web_m2x_options', "version": "0.1", - "description": -""" + "description": """ ===================================================== Add new options for many2one and many2manytags field: ===================================================== @@ -33,14 +32,12 @@ Thanks to: """, "depends": [ 'base', - 'web', + 'web', ], "js": [ 'static/src/js/form.js', ], "author": "Tuxservices", - "installable" : True, - "active" : False, + "installable": True, + "active": False, } - - diff --git a/web_nocreatedb/__openerp__.py b/web_nocreatedb/__openerp__.py index 55992b64..d1a98d20 100644 --- a/web_nocreatedb/__openerp__.py +++ b/web_nocreatedb/__openerp__.py @@ -15,7 +15,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -41,11 +41,11 @@ When you start your server add the name of this module in the "load" option:: Then you can start your server without the -u and -d (just the first time you need update all to be sure all base and web will be fine). -With this option you can just take off and restart the server if you need to show +With this option you can just take off and restart the server if you need to show the link temporaly again. TODO: It should be great add a parameter in the database to hide it configurable -way and with web_preload: True, but BTW, in old versions of openerp it was a +way and with web_preload: True, but BTW, in old versions of openerp it was a parameter in the config file, i think as it is is fine for now. .. note:: This module probably will not be shown in your module list by default diff --git a/web_search_alphabetic/__openerp__.py b/web_search_alphabetic/__openerp__.py index 818d0057..d101c851 100644 --- a/web_search_alphabetic/__openerp__.py +++ b/web_search_alphabetic/__openerp__.py @@ -22,8 +22,8 @@ { 'name': 'Web Alphabetical Search', - 'author' : 'Serpent Consulting Services Pvt. Ltd.', - 'category' : 'Web', + 'author': 'Serpent Consulting Services Pvt. Ltd.', + 'category': 'Web', 'website': 'http://www.serpentcs.com', 'description': """ OpenERP Web Search Extended. @@ -40,7 +40,7 @@ User also is able to change search field name instead of name field. 'css': [ 'static/src/css/web_search.css' ], - 'qweb' : [ + 'qweb': [ 'static/src/xml/web_search.xml', ], 'auto_install': False diff --git a/web_send_message_popup/__openerp__.py b/web_send_message_popup/__openerp__.py index 2cbc0557..d553a441 100644 --- a/web_send_message_popup/__openerp__.py +++ b/web_send_message_popup/__openerp__.py @@ -19,15 +19,15 @@ # ############################################################################## -{'name': 'Web Send Message as Popup', - 'version': '1.0', - 'author': 'Camptocamp', - 'maintainer': 'Camptocamp', - 'license': 'AGPL-3', - 'category': 'Hidden', - 'depends': ['web', - ], - 'description': """ +{ + 'name': 'Web Send Message as Popup', + 'version': '1.0', + 'author': 'Camptocamp', + 'maintainer': 'Camptocamp', + 'license': 'AGPL-3', + 'category': 'Hidden', + 'depends': ['web'], + 'description': """ Web Send Message as Popup ========================= @@ -38,12 +38,9 @@ attachments and followers. This module changes the link 'Send a message' so it opens directly the full featured popup instead of the text field, avoiding an extra click -if the popup is always wanted. - - """, - 'website': 'http://www.camptocamp.com', - 'qweb': ['static/src/xml/mail.xml', - ], - 'installable': True, - 'auto_install': False, +if the popup is always wanted.""", + 'website': 'http://www.camptocamp.com', + 'qweb': ['static/src/xml/mail.xml'], + 'installable': True, + 'auto_install': False, } diff --git a/web_widget_float_formula/__openerp__.py b/web_widget_float_formula/__openerp__.py index 2cd5e8ab..89373082 100644 --- a/web_widget_float_formula/__openerp__.py +++ b/web_widget_float_formula/__openerp__.py @@ -22,9 +22,11 @@ Documentations: Technical informations: ------------------------ - * Overloads "instance.web.form.FieldFloat"; (so works for fields.integer & fields.float); + * Overloads "instance.web.form.FieldFloat"; (so works for fields.integer & + fields.float); * To compute, the module simply use the eval() javascript function; - * Rounding computation is not done by this module (The module has the same behaviour if the user tips "=1/3" or if he tips "0.33[...]"); + * Rounding computation is not done by this module (The module has the same + behaviour if the user tips "=1/3" or if he tips "0.33[...]"); * avoid code injonction by regexpr test: "=alert('security')" is not valid; Limits: From ff2ecdc2aca8bb5e487992e888dd377051682c18 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 7 Jul 2014 14:51:31 +0200 Subject: [PATCH 4/5] [FIX] adapt to change in maintainer-tools --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b89afea2..bf6bd464 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ services: script: - travis_run_flake8 - - travis_run_tests 7.0 openerp_test + - travis_run_tests 7.0 after_success: coveralls From 29384207ff0336ef36aa83f773d0576cbc7e9d20 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 7 Jul 2014 15:41:03 +0200 Subject: [PATCH 5/5] [IMP] Sandy's suggestions --- .coveragerc | 7 ++----- .travis.yml | 5 +---- README.md | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.coveragerc b/.coveragerc index a06f8bfe..cbd4a493 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,12 +1,9 @@ # Config file .coveragerc [report] +include = + */OCA/web/* omit = - /usr/* - */bin/* - */lib/* - */odoo/* - */openerp/* */tests/* *__init__.py diff --git a/.travis.yml b/.travis.yml index bf6bd464..a0500a75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,12 +8,9 @@ virtualenv: install: - git clone https://github.com/gurneyalex/maintainer-quality-tools.git $HOME/maintainer-quality-tools - export PATH=$HOME/maintainer-quality-tools/travis:$PATH - - $HOME/maintainer-quality-tools/travis/travis_install_nightly 7.0 + - travis_install_nightly 7.0 - pip install coveralls flake8 -services: - - postgresql - script: - travis_run_flake8 - travis_run_tests 7.0 diff --git a/README.md b/README.md index d88df981..95f48df5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/OCA/web.svg?branch=7.0)](https://travis-ci.org/OCA/web) -[![Coverage Status](https://img.shields.io/coveralls/OCA/web.svg)](https://coveralls.io/r/OCA/web?branch=7.0) +[![Coverage Status](https://coveralls.io/repos/OCA/web/badge.png?branch=7.0)](https://coveralls.io/r/OCA/web?branch=7.0) Web addons for Odoo ===================