diff --git a/setup/web_widget_dropdown_dynamic/odoo/addons/web_widget_dropdown_dynamic b/setup/web_widget_dropdown_dynamic/odoo/addons/web_widget_dropdown_dynamic
new file mode 120000
index 000000000..df3532d14
--- /dev/null
+++ b/setup/web_widget_dropdown_dynamic/odoo/addons/web_widget_dropdown_dynamic
@@ -0,0 +1 @@
+../../../../web_widget_dropdown_dynamic
\ No newline at end of file
diff --git a/setup/web_widget_dropdown_dynamic/setup.py b/setup/web_widget_dropdown_dynamic/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/web_widget_dropdown_dynamic/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+ setup_requires=['setuptools-odoo'],
+ odoo_addon=True,
+)
diff --git a/setup/web_widget_dropdown_dynamic_example/odoo/addons/web_widget_dropdown_dynamic_example b/setup/web_widget_dropdown_dynamic_example/odoo/addons/web_widget_dropdown_dynamic_example
new file mode 120000
index 000000000..93098faa5
--- /dev/null
+++ b/setup/web_widget_dropdown_dynamic_example/odoo/addons/web_widget_dropdown_dynamic_example
@@ -0,0 +1 @@
+../../../../web_widget_dropdown_dynamic_example
\ No newline at end of file
diff --git a/setup/web_widget_dropdown_dynamic_example/setup.py b/setup/web_widget_dropdown_dynamic_example/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/web_widget_dropdown_dynamic_example/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+ setup_requires=['setuptools-odoo'],
+ odoo_addon=True,
+)
diff --git a/web_widget_dropdown_dynamic/__manifest__.py b/web_widget_dropdown_dynamic/__manifest__.py
index 8a47e74b2..79edb4045 100644
--- a/web_widget_dropdown_dynamic/__manifest__.py
+++ b/web_widget_dropdown_dynamic/__manifest__.py
@@ -1,10 +1,10 @@
-# Copyright 2019 Brainbean Apps (https://brainbeanapps.com)
+# Copyright 2019-2020 Brainbean Apps (https://brainbeanapps.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
"name": "Dynamic Dropdown Widget",
"summary": "This module adds support for dynamic dropdown widget",
"category": "Web",
- "version": "12.0.1.0.0",
+ "version": "13.0.1.0.0",
"license": "AGPL-3",
"author": "Brainbean Apps OU, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web/",
diff --git a/web_widget_dropdown_dynamic/readme/ROADMAP.rst b/web_widget_dropdown_dynamic/readme/ROADMAP.rst
deleted file mode 100644
index 7186b62cf..000000000
--- a/web_widget_dropdown_dynamic/readme/ROADMAP.rst
+++ /dev/null
@@ -1 +0,0 @@
- * In v13, ``$.when`` is going to become `Promise.resolve`
diff --git a/web_widget_dropdown_dynamic/static/src/js/basic_model.js b/web_widget_dropdown_dynamic/static/src/js/basic_model.js
index dbdfb4f23..f5b211e2c 100644
--- a/web_widget_dropdown_dynamic/static/src/js/basic_model.js
+++ b/web_widget_dropdown_dynamic/static/src/js/basic_model.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2019 Brainbean Apps (https://brainbeanapps.com)
+ * Copyright 2019-2020 Brainbean Apps (https://brainbeanapps.com)
* License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
*/
odoo.define("web_widget_dropdown_dynamic.basic_model", function(require) {
@@ -24,7 +24,7 @@ odoo.define("web_widget_dropdown_dynamic.basic_model", function(require) {
var model = fieldInfo.options.model || record.model;
var method = fieldInfo.values || fieldInfo.options.values;
if (!method) {
- return $.when();
+ return Promise.resolve();
}
var context = record.getContext({fieldName: fieldName});
@@ -34,7 +34,7 @@ odoo.define("web_widget_dropdown_dynamic.basic_model", function(require) {
context: context,
});
if (!hasChanged) {
- return $.when();
+ return Promise.resolve();
}
return this._rpc({
diff --git a/web_widget_dropdown_dynamic/static/tests/web_widget_dropdown_dynamic_tests.js b/web_widget_dropdown_dynamic/static/tests/web_widget_dropdown_dynamic_tests.js
index 615534d79..f51b619cd 100644
--- a/web_widget_dropdown_dynamic/static/tests/web_widget_dropdown_dynamic_tests.js
+++ b/web_widget_dropdown_dynamic/static/tests/web_widget_dropdown_dynamic_tests.js
@@ -29,7 +29,7 @@ odoo.define("web_widget_dropdown_dynamic.web_widget_dropdown_dynamic_tests", fun
"",
mockRPC: function(route, args) {
if (args.method === "_get_test_field_values") {
- return $.when([["value", "Title"]]);
+ return Promise.resolve([["value", "Title"]]);
}
return this._super.apply(this, arguments);
},
@@ -61,7 +61,7 @@ odoo.define("web_widget_dropdown_dynamic.web_widget_dropdown_dynamic_tests", fun
"",
mockRPC: function(route, args) {
if (args.method === "_get_test_field_values") {
- return $.when([[0, "Title"]]);
+ return Promise.resolve([[0, "Title"]]);
}
return this._super.apply(this, arguments);
},
@@ -95,7 +95,7 @@ odoo.define("web_widget_dropdown_dynamic.web_widget_dropdown_dynamic_tests", fun
"",
mockRPC: function(route, args) {
if (args.method === "_get_test_field_values") {
- return $.when([["value", "Title"]]);
+ return Promise.resolve([["value", "Title"]]);
}
return this._super.apply(this, arguments);
},
@@ -130,14 +130,14 @@ odoo.define("web_widget_dropdown_dynamic.web_widget_dropdown_dynamic_tests", fun
mockRPC: function(route, args) {
if (args.method === "_get_test_field_values") {
if (args.kwargs.context.step === "step-1") {
- return $.when([["value", "Title"]]);
+ return Promise.resolve([["value", "Title"]]);
} else if (args.kwargs.context.step === "step-2") {
- return $.when([
+ return Promise.resolve([
["value", "Title"],
["value_2", "Title 2"],
]);
}
- return $.when([]);
+ return Promise.resolve([]);
}
return this._super.apply(this, arguments);
},
diff --git a/web_widget_dropdown_dynamic_example/__manifest__.py b/web_widget_dropdown_dynamic_example/__manifest__.py
index 2653aa4e0..17d5781e3 100644
--- a/web_widget_dropdown_dynamic_example/__manifest__.py
+++ b/web_widget_dropdown_dynamic_example/__manifest__.py
@@ -1,10 +1,10 @@
-# Copyright 2019 Brainbean Apps (https://brainbeanapps.com)
+# Copyright 2019-2020 Brainbean Apps (https://brainbeanapps.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
"name": "Dynamic Dropdown Widget: Example",
"summary": "Demonstration of web_widget_dropdown_dynamic",
"category": "Web",
- "version": "12.0.1.0.0",
+ "version": "13.0.1.0.0",
"license": "AGPL-3",
"author": "Brainbean Apps OU, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web/",
diff --git a/web_widget_dropdown_dynamic_example/views/web_widget_dropdown_dynamic_example.xml b/web_widget_dropdown_dynamic_example/views/web_widget_dropdown_dynamic_example.xml
index f89e3f325..defbfede5 100644
--- a/web_widget_dropdown_dynamic_example/views/web_widget_dropdown_dynamic_example.xml
+++ b/web_widget_dropdown_dynamic_example/views/web_widget_dropdown_dynamic_example.xml
@@ -46,7 +46,6 @@
>
web_widget_dropdown_dynamic Demo
web.widget.dropdown.dynamic.example
- form
form