move client action code to website

odoo-dev · Jan 31, 2025 · ee383c5 · ee383c5
1 parent 20d739f
commit ee383c5
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 15 deletions.
diff --git a/addons/html_builder/__manifest__.py b/addons/html_builder/__manifest__.py
@@ -18,18 +18,10 @@
     'auto_install': True,
 
     # any module necessary for this one to work correctly
-    'depends': ['base', 'html_editor', 'website'],
-
-    # always loaded
-    'data': [
-        # 'security/ir.model.access.csv',
-        'views/views.xml',
-    ],
+    'depends': ['base', 'html_editor'],
 
     'assets': {
-        'web.assets_backend': [
-            'html_builder/static/src/website_preview/**/*',
-        ],
+
         # this bundle is lazy loaded when the editor is ready
         'html_builder.assets': [
             ('include', 'web._assets_helpers'),
@@ -40,7 +32,6 @@
             'web/static/lib/bootstrap/scss/_maps.scss',
 
             'html_builder/static/src/**/*',
-            ('remove', 'html_builder/static/src/website_preview/**/*'),
         ],
         'html_builder.inside_builder_style': [
             ('include', 'web._assets_helpers'),

diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
@@ -12,6 +12,7 @@
         'digest',
         'web',
         'web_editor',
+        'html_builder',
         'http_routing',
         'portal',
         'social_media',
@@ -178,6 +179,7 @@
         'views/ir_model_views.xml',
         'views/res_partner_views.xml',
         'views/neutralize_views.xml',
+        'views/website_builder_views.xml',
         'wizard/base_language_install_views.xml',
         'wizard/blocked_third_party_domains.xml',
         'wizard/website_robots.xml',
@@ -192,6 +194,9 @@
     'post_init_hook': 'post_init_hook',
     'uninstall_hook': 'uninstall_hook',
     'assets': {
+        'web.assets_backend': [
+            'website/static/src/website_preview/**/*',
+        ],
         'web.assets_frontend': [
             'website/static/src/interactions/**/*',
             'website/static/src/core/**/*',

diff --git a/...site_preview/edit_website_systray_item.js → ...site_builder/edit_website_systray_item.js b/...site_preview/edit_website_systray_item.js → ...site_builder/edit_website_systray_item.js
diff --git a/...ite_preview/edit_website_systray_item.xml → ...ite_builder/edit_website_systray_item.xml b/...ite_preview/edit_website_systray_item.xml → ...ite_builder/edit_website_systray_item.xml
diff --git a/...website_preview/website_builder_action.js → ...website_builder/website_builder_action.js b/...website_preview/website_builder_action.js → ...website_builder/website_builder_action.js
@@ -204,4 +204,4 @@ function isTopWindowURL({ host, pathname }) {
     );
 }
 
-registry.category("actions").add("egg_website_preview", WebsiteBuilder);
+registry.category("actions").add("website_builder_action", WebsiteBuilder);
diff --git a/...bsite_preview/website_builder_action.scss → ...bsite_builder/website_builder_action.scss b/...bsite_preview/website_builder_action.scss → ...bsite_builder/website_builder_action.scss
diff --git a/...ebsite_preview/website_builder_action.xml → ...ebsite_builder/website_builder_action.xml b/...ebsite_preview/website_builder_action.xml → ...ebsite_builder/website_builder_action.xml
diff --git a/...c/website_preview/website_systray_item.js → ...s/website_builder/website_systray_item.js b/...c/website_preview/website_systray_item.js → ...s/website_builder/website_systray_item.js
diff --git a/.../website_preview/website_systray_item.xml → .../website_builder/website_systray_item.xml b/.../website_preview/website_systray_item.xml → .../website_builder/website_systray_item.xml
diff --git a/addons/html_builder/views/views.xml → ...s/website/views/website_builder_views.xml b/addons/html_builder/views/views.xml → ...s/website/views/website_builder_views.xml
@@ -1,13 +1,13 @@
 <odoo>
     <data>
-        <record id="html_builder.website_preview" model="ir.actions.client">
+        <record id="website.website_preview" model="ir.actions.client">
             <field name="name">Website Preview</field>
-            <field name="tag">egg_website_preview</field>
+            <field name="tag">website_builder_action</field>
         </record>
 
         <menuitem name="Website Preview"
                         id="menu_website_preview"
-                        action="html_builder.website_preview"
+                        action="website.website_preview"
                         sequence="1"
             />
     </data>
-Original file line number
+Diff line change
@@ Expand Up / @@ -204,4 +204,4 @@ function isTopWindowURL({ host, pathname }) { @@
         );
     }
-    registry.category("actions").add("egg_website_preview", WebsiteBuilder);
+    registry.category("actions").add("website_builder_action", WebsiteBuilder);