From 200e2f8a1790b4a027178589e8337317fa72c781 Mon Sep 17 00:00:00 2001 From: Mayank Gosai Date: Tue, 2 Jul 2019 18:35:41 -0400 Subject: [PATCH] [MIG] web_widget_digitized_signature: Migration to 12.0 --- .../__manifest__.py | 20 +++++++++++-------- .../models/res_users.py | 6 ++---- .../readme/CONTRIBUTORS.rst | 8 +++++--- .../readme/CREDITS.rst | 1 + .../static/description/index.html | 2 ++ .../static/src/js/digital_sign.js | 4 ++-- .../views/res_users_view.xml | 2 +- .../views/web_digital_sign_view.xml | 8 +++++--- 8 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 web_widget_digitized_signature/readme/CREDITS.rst diff --git a/web_widget_digitized_signature/__manifest__.py b/web_widget_digitized_signature/__manifest__.py index 42927a8b..5e5598a4 100644 --- a/web_widget_digitized_signature/__manifest__.py +++ b/web_widget_digitized_signature/__manifest__.py @@ -1,18 +1,20 @@ # Copyright 2004-2010 OpenERP SA () # Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd. # Copyright 2017 Tecnativa - Vicent Cubells +# Copyright (C) 2019 - TODAY, Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { - "name": "Web Widget Digitized Signature", - "version": "11.0.1.0.0", - "author": "Serpent Consulting Services Pvt. Ltd., " - "Agile Business Group, " - "Tecnativa, " - "Odoo Community Association (OCA)", + 'name': 'Web Widget Digitized Signature', + 'version': '12.0.1.0.0', + 'author': 'Serpent Consulting Services Pvt. Ltd., ' + 'Agile Business Group, ' + 'Tecnativa, ' + 'Open Source Integrators,' + 'Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/web', - "license": "AGPL-3", - "category": 'Web', + 'license': 'AGPL-3', + 'category': 'Web', 'depends': [ 'web', 'mail', @@ -25,4 +27,6 @@ 'static/src/xml/digital_sign.xml', ], 'installable': True, + 'development_status': 'Stable', + 'maintainers': ['cubells'], } diff --git a/web_widget_digitized_signature/models/res_users.py b/web_widget_digitized_signature/models/res_users.py index e90efc99..a5cc4836 100644 --- a/web_widget_digitized_signature/models/res_users.py +++ b/web_widget_digitized_signature/models/res_users.py @@ -10,10 +10,8 @@ class ResUsers(models.Model): _name = 'res.users' _inherit = ['res.users', 'mail.thread'] - digital_signature = fields.Binary( - string='Signature', - oldname="signature_image", - ) + digital_signature = fields.Binary(string='Digital Signature', + oldname="signature_image") @api.model def create(self, vals): diff --git a/web_widget_digitized_signature/readme/CONTRIBUTORS.rst b/web_widget_digitized_signature/readme/CONTRIBUTORS.rst index 888312b9..e8aca10d 100644 --- a/web_widget_digitized_signature/readme/CONTRIBUTORS.rst +++ b/web_widget_digitized_signature/readme/CONTRIBUTORS.rst @@ -1,4 +1,6 @@ * Jay Vora -* Tecnativa : - - * Vicent Cubells +* Lorenzo Battistini +* Pedro M. Baeza +* Vicent Cubells +* Mayank Gosai +* Maxime Chambreuil diff --git a/web_widget_digitized_signature/readme/CREDITS.rst b/web_widget_digitized_signature/readme/CREDITS.rst new file mode 100644 index 00000000..ebef9948 --- /dev/null +++ b/web_widget_digitized_signature/readme/CREDITS.rst @@ -0,0 +1 @@ +* Tecnativa diff --git a/web_widget_digitized_signature/static/description/index.html b/web_widget_digitized_signature/static/description/index.html index f2b84dcc..aa4ed4f2 100644 --- a/web_widget_digitized_signature/static/description/index.html +++ b/web_widget_digitized_signature/static/description/index.html @@ -420,6 +420,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Serpent Consulting Services Pvt. Ltd.
  • Agile Business Group
  • Tecnativa
    • +
  • Open Source Integrators
    • @@ -429,6 +430,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Tecnativa <https://www.tecnativa.com>:
    • Vicent Cubells
    +
  • Mayank Gosai <mgosai@opensourceintegrators.com>
    • diff --git a/web_widget_digitized_signature/static/src/js/digital_sign.js b/web_widget_digitized_signature/static/src/js/digital_sign.js index 842f89a8..63f23d9f 100644 --- a/web_widget_digitized_signature/static/src/js/digital_sign.js +++ b/web_widget_digitized_signature/static/src/js/digital_sign.js @@ -22,8 +22,8 @@ odoo.define('web_widget_digitized_signature.web_digital_sign', function(require) placeholder: "/web/static/src/img/placeholder.png", init: function() { this._super.apply(this, arguments); - this.$('> img').remove(); - this.$('.signature > canvas').remove(); +// this.$('> img').remove(); +// this.$('.signature > canvas').remove(); this.sign_options = { 'decor-color': '#D1D0CE', 'color': '#000', diff --git a/web_widget_digitized_signature/views/res_users_view.xml b/web_widget_digitized_signature/views/res_users_view.xml index 49934e08..d7127ad3 100644 --- a/web_widget_digitized_signature/views/res_users_view.xml +++ b/web_widget_digitized_signature/views/res_users_view.xml @@ -1,4 +1,3 @@ - @@ -14,6 +13,7 @@ + inherited.res.users.preferences.form res.users diff --git a/web_widget_digitized_signature/views/web_digital_sign_view.xml b/web_widget_digitized_signature/views/web_digital_sign_view.xml index 9c63731d..b074ec8c 100644 --- a/web_widget_digitized_signature/views/web_digital_sign_view.xml +++ b/web_widget_digitized_signature/views/web_digital_sign_view.xml @@ -1,9 +1,11 @@ - -