From 11df1af102a9028fa2c85dd7060f65efd7204880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 21 Mar 2023 08:37:43 +0000 Subject: [PATCH] [MOV] website_forum: rename remaining files PURPOSE Reorganize website_forum module. This allows to better locate code, understand organization, and prepare future changes. SPECIFICATIONS Rename remaining files: controllers, sub-modules, tests, ... Task-3240082 (Forum: Reorganize and lint module) Part-of: odoo/odoo#114841 --- addons/website_forum/__manifest__.py | 2 +- addons/website_forum/controllers/__init__.py | 2 +- .../website_forum/controllers/{main.py => website_forum.py} | 0 addons/website_forum/models/__init__.py | 2 +- .../models/{gamification.py => gamification_challenge.py} | 0 .../{website_forum_security.xml => ir_rule_data.xml} | 0 addons/website_forum/tests/__init__.py | 6 +++--- .../tests/{test_forum.py => test_forum_karma_access.py} | 0 .../tests/{test_forum_process.py => test_forum_tours.py} | 0 .../tests/{test_controller.py => test_web_editor.py} | 0 addons/website_slides_forum/__manifest__.py | 2 +- addons/website_slides_forum/models/__init__.py | 2 +- .../models/{forum.py => forum_forum.py} | 0 ...slides_forum_templates.xml => forum_forum_templates.xml} | 0 14 files changed, 8 insertions(+), 8 deletions(-) rename addons/website_forum/controllers/{main.py => website_forum.py} (100%) rename addons/website_forum/models/{gamification.py => gamification_challenge.py} (100%) rename addons/website_forum/security/{website_forum_security.xml => ir_rule_data.xml} (100%) rename addons/website_forum/tests/{test_forum.py => test_forum_karma_access.py} (100%) rename addons/website_forum/tests/{test_forum_process.py => test_forum_tours.py} (100%) rename addons/website_forum/tests/{test_controller.py => test_web_editor.py} (100%) rename addons/website_slides_forum/models/{forum.py => forum_forum.py} (100%) rename addons/website_slides_forum/views/{website_slides_forum_templates.xml => forum_forum_templates.xml} (100%) diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py index db06dae0e5b..80019e925d1 100644 --- a/addons/website_forum/__manifest__.py +++ b/addons/website_forum/__manifest__.py @@ -45,7 +45,7 @@ Ask questions, get answers, no distractions 'views/snippets/snippets.xml', 'security/ir.model.access.csv', - 'security/website_forum_security.xml', + 'security/ir_rule_data.xml', 'data/gamification_badge_data_question.xml', 'data/gamification_badge_data_answer.xml', diff --git a/addons/website_forum/controllers/__init__.py b/addons/website_forum/controllers/__init__.py index 65a8c12013d..c9b7192ed7a 100644 --- a/addons/website_forum/controllers/__init__.py +++ b/addons/website_forum/controllers/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -from . import main +from . import website_forum diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/website_forum.py similarity index 100% rename from addons/website_forum/controllers/main.py rename to addons/website_forum/controllers/website_forum.py diff --git a/addons/website_forum/models/__init__.py b/addons/website_forum/models/__init__.py index 5162fc5e910..6b00bea2ef3 100644 --- a/addons/website_forum/models/__init__.py +++ b/addons/website_forum/models/__init__.py @@ -5,7 +5,7 @@ from . import forum_post from . import forum_post_reason from . import forum_post_vote from . import forum_tag -from . import gamification +from . import gamification_challenge from . import gamification_karma_tracking from . import ir_attachment from . import res_users diff --git a/addons/website_forum/models/gamification.py b/addons/website_forum/models/gamification_challenge.py similarity index 100% rename from addons/website_forum/models/gamification.py rename to addons/website_forum/models/gamification_challenge.py diff --git a/addons/website_forum/security/website_forum_security.xml b/addons/website_forum/security/ir_rule_data.xml similarity index 100% rename from addons/website_forum/security/website_forum_security.xml rename to addons/website_forum/security/ir_rule_data.xml diff --git a/addons/website_forum/tests/__init__.py b/addons/website_forum/tests/__init__.py index 5df629efdd2..1ddabc7f08d 100644 --- a/addons/website_forum/tests/__init__.py +++ b/addons/website_forum/tests/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from . import common -from . import test_controller -from . import test_forum -from . import test_forum_process +from . import test_forum_karma_access +from . import test_forum_tours +from . import test_web_editor diff --git a/addons/website_forum/tests/test_forum.py b/addons/website_forum/tests/test_forum_karma_access.py similarity index 100% rename from addons/website_forum/tests/test_forum.py rename to addons/website_forum/tests/test_forum_karma_access.py diff --git a/addons/website_forum/tests/test_forum_process.py b/addons/website_forum/tests/test_forum_tours.py similarity index 100% rename from addons/website_forum/tests/test_forum_process.py rename to addons/website_forum/tests/test_forum_tours.py diff --git a/addons/website_forum/tests/test_controller.py b/addons/website_forum/tests/test_web_editor.py similarity index 100% rename from addons/website_forum/tests/test_controller.py rename to addons/website_forum/tests/test_web_editor.py diff --git a/addons/website_slides_forum/__manifest__.py b/addons/website_slides_forum/__manifest__.py index 30ad345fab6..1623485c00c 100644 --- a/addons/website_slides_forum/__manifest__.py +++ b/addons/website_slides_forum/__manifest__.py @@ -19,7 +19,7 @@ 'views/res_config_settings_views.xml', 'views/slide_channel_views.xml', 'views/website_slides_menu_views.xml', - 'views/website_slides_forum_templates.xml', + 'views/forum_forum_templates.xml', 'views/website_slides_templates.xml', 'views/snippets.xml', ], diff --git a/addons/website_slides_forum/models/__init__.py b/addons/website_slides_forum/models/__init__.py index 68c2a5669da..00f2cb35d7c 100644 --- a/addons/website_slides_forum/models/__init__.py +++ b/addons/website_slides_forum/models/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- -from . import forum +from . import forum_forum from . import slide_channel diff --git a/addons/website_slides_forum/models/forum.py b/addons/website_slides_forum/models/forum_forum.py similarity index 100% rename from addons/website_slides_forum/models/forum.py rename to addons/website_slides_forum/models/forum_forum.py diff --git a/addons/website_slides_forum/views/website_slides_forum_templates.xml b/addons/website_slides_forum/views/forum_forum_templates.xml similarity index 100% rename from addons/website_slides_forum/views/website_slides_forum_templates.xml rename to addons/website_slides_forum/views/forum_forum_templates.xml