From f5f6658816a71440dedfa166defd91d5e3ca49c7 Mon Sep 17 00:00:00 2001 From: Joan Sisquella Date: Tue, 3 Mar 2020 11:30:34 +0100 Subject: [PATCH] [IMP] Merge 'web_widget_prefixed_url' --- web_widget_url_advanced/readme/CONTRIBUTORS.rst | 3 +++ web_widget_url_advanced/readme/DESCRIPTION.rst | 11 ++++++++--- web_widget_url_advanced/readme/USAGE.rst | 12 ++++++++++++ web_widget_url_advanced/static/src/js/url_widget.js | 12 ++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/web_widget_url_advanced/readme/CONTRIBUTORS.rst b/web_widget_url_advanced/readme/CONTRIBUTORS.rst index 7181ef36a..ec477d818 100644 --- a/web_widget_url_advanced/readme/CONTRIBUTORS.rst +++ b/web_widget_url_advanced/readme/CONTRIBUTORS.rst @@ -1,2 +1,5 @@ * Simone Orsi * Alexey Pelykh +* Jay Vora +* Swapnesh Shah +* Joan Sisquella diff --git a/web_widget_url_advanced/readme/DESCRIPTION.rst b/web_widget_url_advanced/readme/DESCRIPTION.rst index 1dd8b1a54..880e48a64 100644 --- a/web_widget_url_advanced/readme/DESCRIPTION.rst +++ b/web_widget_url_advanced/readme/DESCRIPTION.rst @@ -1,6 +1,11 @@ Extend URL widget features to ease customization of anchor's text. -By default the URL widget will show the plain URL. -You can specify an attribute `text` to provide a static label too. +By default, the URL widget will show the plain URL. +You can specify an attribute to provide a static label too. -With this module you can use a field for link's inner text. +With this module, you can use a field for link's inner text using attribute +'text_field'. You can also add a prefix to the link using attribute +'prefix_name'. + +Until 13.0 this functionality was separated in modules 'web_widget_url_advanced' +and 'web_widget_prefixed_url' diff --git a/web_widget_url_advanced/readme/USAGE.rst b/web_widget_url_advanced/readme/USAGE.rst index 88f6474ae..fbd872911 100644 --- a/web_widget_url_advanced/readme/USAGE.rst +++ b/web_widget_url_advanced/readme/USAGE.rst @@ -25,3 +25,15 @@ This is going to change the rendering from to .. figure:: ../static/description/after.png + +Or user can add any hyperlink text using 'prefix_name' attribute + +.. code-block:: xml + + + +both can be applied inside the options attribute too: + +.. code-block:: xml + + diff --git a/web_widget_url_advanced/static/src/js/url_widget.js b/web_widget_url_advanced/static/src/js/url_widget.js index 6f98df72c..913bb3067 100644 --- a/web_widget_url_advanced/static/src/js/url_widget.js +++ b/web_widget_url_advanced/static/src/js/url_widget.js @@ -23,5 +23,17 @@ odoo.define("web_widget_url_advanced", function(require) { this.attrs.text = field_value; } }, + /** + * + * @override + * @private + */ + _renderReadonly: function() { + this._super.apply(this, arguments); + var prefix = this.attrs.prefix_name || this.attrs.options.prefix_name; + if (prefix) { + this.$el.attr("href", prefix + ":" + this.value); + } + }, }); });