diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-10-11 16:12:10 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-10-11 16:12:10 +0200 |
| commit | b2a546e0f8ee88a7cadcf883abed4042aa62d72c (patch) | |
| tree | 03a6ae0524f73cc8478431bdaaada2d982af2d1a | |
| parent | e14a26ee13c5754b4cdbb53323a54c4da283a768 (diff) | |
[MOV] [FIX] website_event: module organization cleaning
- moved model-related files in models directory
- moved data/demo files in data directory
- fixed wrong class import in tests
bzr revid: tde@openerp.com-20131011141210-0v3gy9292ymeo8vc
| -rw-r--r-- | addons/website_event/__init__.py | 2 | ||||
| -rw-r--r-- | addons/website_event/__openerp__.py | 7 | ||||
| -rw-r--r-- | addons/website_event/data/event_data.xml (renamed from addons/website_event/event_data.xml) | 0 | ||||
| -rw-r--r-- | addons/website_event/data/event_demo.xml (renamed from addons/website_event/event_demo.xml) | 0 | ||||
| -rw-r--r-- | addons/website_event/models/__init__.py | 1 | ||||
| -rw-r--r-- | addons/website_event/models/event.py (renamed from addons/website_event/event.py) | 0 | ||||
| -rw-r--r-- | addons/website_event/tests/test_controllers.py | 4 |
7 files changed, 8 insertions, 6 deletions
diff --git a/addons/website_event/__init__.py b/addons/website_event/__init__.py index b4f256be0d9..708d6ce4669 100644 --- a/addons/website_event/__init__.py +++ b/addons/website_event/__init__.py @@ -20,4 +20,4 @@ ############################################################################## import controllers -import event +import models diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py index a5b034b0a8f..26a1e084564 100644 --- a/addons/website_event/__openerp__.py +++ b/addons/website_event/__openerp__.py @@ -13,13 +13,14 @@ Online Events 'author': 'OpenERP SA', 'depends': ['website', 'website_mail', 'event_sale', 'website_sale'], 'data': [ - 'event_data.xml', + 'data/event_data.xml', 'views/website_event.xml', 'security/ir.model.access.csv', 'security/website_event.xml', - 'event_demo.xml', ], 'qweb': ['static/src/xml/*.xml'], - 'demo': [], + 'demo': [ + 'data/event_demo.xml' + ], 'installable': True, } diff --git a/addons/website_event/event_data.xml b/addons/website_event/data/event_data.xml index bb0c6745c53..bb0c6745c53 100644 --- a/addons/website_event/event_data.xml +++ b/addons/website_event/data/event_data.xml diff --git a/addons/website_event/event_demo.xml b/addons/website_event/data/event_demo.xml index d45aa6cc9e1..d45aa6cc9e1 100644 --- a/addons/website_event/event_demo.xml +++ b/addons/website_event/data/event_demo.xml diff --git a/addons/website_event/models/__init__.py b/addons/website_event/models/__init__.py new file mode 100644 index 00000000000..e7c003730cf --- /dev/null +++ b/addons/website_event/models/__init__.py @@ -0,0 +1 @@ +import event diff --git a/addons/website_event/event.py b/addons/website_event/models/event.py index 0362b5845b7..0362b5845b7 100644 --- a/addons/website_event/event.py +++ b/addons/website_event/models/event.py diff --git a/addons/website_event/tests/test_controllers.py b/addons/website_event/tests/test_controllers.py index d1c28cab5af..33b37aede9d 100644 --- a/addons/website_event/tests/test_controllers.py +++ b/addons/website_event/tests/test_controllers.py @@ -19,11 +19,11 @@ # ############################################################################## -from openerp.addons.mail.tests.test_mail_base import TestMailBase +from openerp.addons.mail.tests.common import TestMail from openerp.tools import mute_logger, email_split -class TestControllers(TestMailBase): +class TestControllers(TestMail): def test_00(self): cr, uid = self.cr, self.uid |