spp_branding_kit: refine controllers and hooks; correct JSON response; keep correct Odoo series; avoid disabling cache-clear cron; doc addon path fix; mark user field readonly; limit telemetry XHR interception

Author: jeremi

spp_branding_kit/__init__.py

@@ -25,10 +25,9 @@ def post_init_hook(env):
             brand_promotion.active = False
             _logger.info("Disabled Odoo brand promotion message")
 
-        # Disable specific Odoo telemetry and update cron jobs by their external IDs
+        # Disable specific Odoo update notification cron (if present)
         crons_to_disable = [
             "mail.ir_cron_module_update_notification",  # Module update notification
-            "base.ir_cron_res_partner_clear_caches",  # Partner cache clearing (if telemetry related)
         ]
 
         for cron_xml_id in crons_to_disable:

spp_branding_kit/controllers/main.py

@@ -1,22 +1,13 @@
 # ABOUTME: Main controller for OpenSPP Branding Kit
-# ABOUTME: Handles custom routes, branding overrides, and security enforcement
+# ABOUTME: Handles custom routes and branding-related endpoints
 
 import json
 
+from werkzeug.wrappers import Response
+
 from odoo import http
 from odoo.http import request
 
-from odoo.addons.portal.controllers.web import Home
-
-
-class OpenSPPHome(Home):
-    """Override Home controller to enforce branding and security settings"""
-
-    @http.route()
-    def web_client(self, s_action=None, **kw):
-        """Override web client for branding"""
-        return super().web_client(s_action, **kw)
-
 
 class OpenSPPBrandingController(http.Controller):
     """Custom routes for OpenSPP branding"""
@@ -44,7 +35,8 @@ def version_info(self):
         system_name = config_parameter.get_param("openspp.system_name", "OpenSPP Platform")
         return {
             "server_version": system_name,
-            "server_serie": "1.0",
+            # Keep the server series aligned with the actual Odoo major version
+            "server_serie": "17.0",
             "protocol_version": 1,
         }
 
@@ -55,12 +47,16 @@ def publisher_warranty(self, **kwargs):
         telemetry_enabled = config_parameter.get_param("openspp.telemetry_enabled", "True") == "True"
 
         if not telemetry_enabled:
-            return json.dumps({"status": "disabled", "message": "Telemetry disabled"})
+            payload = {"status": "disabled", "message": "Telemetry disabled"}
         else:
             # Redirect to OpenSPP telemetry endpoint
             telemetry_endpoint = config_parameter.get_param(
                 "openspp.telemetry_endpoint", "https://telemetry.openspp.org"
             )
-            return json.dumps(
-                {"status": "redirected", "endpoint": telemetry_endpoint, "message": "Telemetry redirected to OpenSPP"}
-            )
+            payload = {
+                "status": "redirected",
+                "endpoint": telemetry_endpoint,
+                "message": "Telemetry redirected to OpenSPP",
+            }
+
+        return Response(json.dumps(payload), content_type="application/json")

spp_branding_kit/models/ir_http.py

@@ -33,8 +33,8 @@ def session_info(self):
             }
         )
 
-        # Customize server version info
+        # Customize server version info while keeping the correct Odoo series
         if "server_version_info" in result:
-            result["server_version_info"] = ["OpenSPP", "1.0", "", "", ""]
+            result["server_version_info"] = ["OpenSPP", "17.0", "", "", ""]
 
         return result

spp_branding_kit/models/res_users.py

@@ -22,5 +22,5 @@ def _compute_odoo_account_url(self):
             user.odoo_account_url = False
 
     odoo_account_url = fields.Char(
-        compute="_compute_odoo_account_url", string="Account URL", help="OpenSPP Account Management"
+        compute="_compute_odoo_account_url", string="Account URL", help="OpenSPP Account Management", readonly=True
     )

spp_branding_kit/static/description/index.html

@@ -143,8 +143,8 @@ <h3>Installation Steps</h3>
                         <li>Clone the OCA server-brand repository:
                             <div class="code">git clone --branch 17.0 https://github.com/OCA/server-brand.git</div>
                         </li>
-                        <li>Add both module paths to your Odoo configuration:
-                            <div class="code">addons_path = /path/to/openspp_branding_kit,/path/to/server-brand,...</div>
+                        <li>Add both module paths to your Odoo configuration (directories containing your addons):
+                            <div class="code">addons_path = /path/to/custom-addons,/path/to/server-brand,/path/to/odoo/addons</div>
                         </li>
                         <li>Restart Odoo server and update the apps list</li>
                         <li>Install the OpenSPP Branding Kit module from the Apps menu</li>
@@ -220,4 +220,4 @@ <h2>License</h2>
         </div>
     </div>
 </body>
-</html>
+</html>

spp_branding_kit/static/src/js/telemetry_manager.js

@@ -7,10 +7,10 @@ const telemetryEnabled = session.openspp_telemetry_enabled !== false;
 const telemetryEndpoint = session.openspp_telemetry_endpoint || "https://telemetry.openspp.org";
 
 // Log telemetry configuration for debugging
-if (!telemetryEnabled) {
-    console.log("OpenSPP: Telemetry is disabled");
-} else {
+if (telemetryEnabled) {
     console.log("OpenSPP: Telemetry endpoint:", telemetryEndpoint);
+} else {
+    console.log("OpenSPP: Telemetry is disabled");
 }
 
 // In Odoo 17, telemetry blocking is better handled at the controller level
@@ -28,24 +28,17 @@ XMLHttpRequest.prototype.open = function (method, url, ...args) {
     if (shouldBlock) {
         if (!telemetryEnabled) {
             console.log("OpenSPP: Blocked telemetry call to", url);
-            // Return a dummy request that does nothing
+            // Replace send/abort with harmless stubs
             this.send = function () {
-                // Intentionally empty to block telemetry
+                return false;
             };
             this.abort = function () {
-                // Intentionally empty to block telemetry
+                return null;
             };
             return;
         }
-        console.log("OpenSPP: Would redirect telemetry from", url, "to", telemetryEndpoint);
-        // For now, block the call as redirection requires backend implementation
-        this.send = function () {
-            // Intentionally empty to block telemetry
-        };
-        this.abort = function () {
-            // Intentionally empty to block telemetry
-        };
-        return;
+        // When telemetry is enabled, do not intercept; server handles /publisher-warranty
+        // Optionally, you could redirect here, but we keep the default behavior
     }
 
     return originalOpen.call(this, method, url, ...args);