[IMP] base_tier_validation: Migrated js for the new Widget tier_valid…

…ation.
OCA · Oct 20, 2022 · 525a7a9 · 525a7a9
1 parent 566d043
commit 525a7a9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/base_tier_validation/__manifest__.py b/base_tier_validation/__manifest__.py
@@ -25,14 +25,13 @@
     ],
     "assets": {
         "web.assets_backend": [
-            "/base_tier_validation/static/src/js/systray.js",
-            "/base_tier_validation/static/src/js/tier_review_widget.js",
             "/base_tier_validation/static/src/scss/systray.scss",
             "/base_tier_validation/static/src/scss/review.scss",
-        ],
-        "web.assets_qweb": [
-            "base_tier_validation/static/src/xml/systray.xml",
-            "base_tier_validation/static/src/xml/tier_review_template.xml",
+            "/base_tier_validation/static/src/js/systray.js",
+            "/base_tier_validation/static/src/js/tier_review_widget.js",
+            "/base_tier_validation/static/src/xml/**/*",
+            # "/base_tier_validation/static/src/xml/systray.xml",
+            # "/base_tier_validation/static/src/xml/tier_review_template.xml",
         ],
     },
 }
diff --git a/base_tier_validation/static/src/js/systray.js b/base_tier_validation/static/src/js/systray.js
@@ -19,9 +19,16 @@ odoo.define("tier_validation.systray", function (require) {
             this.$reviews_preview = this.$(".o_mail_systray_dropdown_items");
             this._updateReviewPreview();
             var channel = "base.tier.validation";
+            // This.call("bus_service", "addChannel", channel);
+            // this.call("bus_service", "startPolling");
+            // this.call("bus_service", "onNotification", this, this._updateReviewPreview);
             this.call("bus_service", "addChannel", channel);
-            this.call("bus_service", "startPolling");
-            this.call("bus_service", "onNotification", this, this._updateReviewPreview);
+            this.call(
+                "bus_service",
+                "addEventListener",
+                this,
+                this._updateReviewPreview
+            );
             return this._super();
         },
 

diff --git a/base_tier_validation/static/src/js/tier_review_widget.js b/base_tier_validation/static/src/js/tier_review_widget.js
@@ -9,11 +9,17 @@ odoo.define("base_tier_validation.ReviewField", function (require) {
 
     var ReviewField = AbstractField.extend({
         template: "tier.review.Collapse",
-        events: {
+        events: _.extend({}, AbstractField.prototype.events, {
             "click .o_info_btn": "_onButtonClicked",
             "show.bs.collapse": "_showCollapse",
             "hide.bs.collapse": "_hideCollapse",
-        },
+        }),
+        // Events: {
+        //     "click .o_info_btn": "_onButtonClicked",
+        //     "show.bs.collapse": "_showCollapse",
+        //     "hide.bs.collapse": "_hideCollapse",
+        // },
+
         start: function () {
             var self = this;
             self._renderDropdown();