From 30683492e7c5901f3c89147779e5d030d816fd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= Date: Thu, 12 Mar 2020 13:17:08 +0530 Subject: [PATCH] [MIG] Migration to 12.0: web_widget_image_webcam --- web_widget_image_webcam/README.rst | 1 + web_widget_image_webcam/__init__.py | 3 --- web_widget_image_webcam/__manifest__.py | 3 ++- web_widget_image_webcam/models/__init__.py | 3 --- .../models/ir_config_parameter.py | 5 +++-- web_widget_image_webcam/readme/CONFIGURE.rst | 13 +++++++++++++ web_widget_image_webcam/readme/CONTRIBUTORS.rst | 5 +++++ web_widget_image_webcam/readme/DESCRIPTION.rst | 1 + .../static/src/css/web_widget_image_webcam.css | 6 +++++- .../static/src/xml/web_widget_image_webcam.xml | 15 +++++++-------- web_widget_image_webcam/views/assets.xml | 9 +++------ 11 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 web_widget_image_webcam/readme/CONFIGURE.rst create mode 100644 web_widget_image_webcam/readme/CONTRIBUTORS.rst create mode 100644 web_widget_image_webcam/readme/DESCRIPTION.rst diff --git a/web_widget_image_webcam/README.rst b/web_widget_image_webcam/README.rst index 3790845c9..7c7a726ea 100644 --- a/web_widget_image_webcam/README.rst +++ b/web_widget_image_webcam/README.rst @@ -41,6 +41,7 @@ Contributors * Siddharth Bhalgami * Kaushal Prajapati +* Druidoo () Maintainer ---------- diff --git a/web_widget_image_webcam/__init__.py b/web_widget_image_webcam/__init__.py index 26ecd8a91..0650744f6 100644 --- a/web_widget_image_webcam/__init__.py +++ b/web_widget_image_webcam/__init__.py @@ -1,4 +1 @@ -# Copyright 2019 Siddharth Bhalgami -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). - from . import models diff --git a/web_widget_image_webcam/__manifest__.py b/web_widget_image_webcam/__manifest__.py index eb14bdb11..f3d80c24c 100644 --- a/web_widget_image_webcam/__manifest__.py +++ b/web_widget_image_webcam/__manifest__.py @@ -1,9 +1,10 @@ # Copyright 2016 Siddharth Bhalgami +# Copyright (C) 2019-Today: Druidoo () # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). { "name": "Web Widget - Image WebCam", "summary": "Allows to take image with WebCam", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "category": "web", "website": "https://github.com/OCA/web", "author": "Tech Receptives, " diff --git a/web_widget_image_webcam/models/__init__.py b/web_widget_image_webcam/models/__init__.py index 7f5514dde..bd3aa9f10 100644 --- a/web_widget_image_webcam/models/__init__.py +++ b/web_widget_image_webcam/models/__init__.py @@ -1,4 +1 @@ -# Copyright 2019 Siddharth Bhalgami -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). - from . import ir_config_parameter diff --git a/web_widget_image_webcam/models/ir_config_parameter.py b/web_widget_image_webcam/models/ir_config_parameter.py index 5f2be0eeb..4321068bf 100644 --- a/web_widget_image_webcam/models/ir_config_parameter.py +++ b/web_widget_image_webcam/models/ir_config_parameter.py @@ -1,10 +1,11 @@ # Copyright 2019 Siddharth Bhalgami +# Copyright 2019-Today: Druidoo () # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -from odoo.models import api, Model +from odoo import api, models -class IrConfigParameter(Model): +class IrConfigParameter(models.Model): _inherit = "ir.config_parameter" @api.model diff --git a/web_widget_image_webcam/readme/CONFIGURE.rst b/web_widget_image_webcam/readme/CONFIGURE.rst new file mode 100644 index 000000000..409ad16ba --- /dev/null +++ b/web_widget_image_webcam/readme/CONFIGURE.rst @@ -0,0 +1,13 @@ +By default, the module works with all `major browsers +`_. + +An important note for **Chrome 47+** users - this module only works with websites delivered over SSL / HTTPS. +Visit this for `more info +`_. + +But, If you still want this module to work with websites without SSL / HTTPS. +Here is the steps to do it easily (Always run in Adobe Flash fallback mode, but it is not desirable). + +Set the configuration parameter ``web_widget_image_webcam.flash_fallback_mode`` to ``1`` + +Its done! Now this module also work with websites without SSL / HTTPS. diff --git a/web_widget_image_webcam/readme/CONTRIBUTORS.rst b/web_widget_image_webcam/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..bde168581 --- /dev/null +++ b/web_widget_image_webcam/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* Siddharth Bhalgami +* Kaushal Prajapati +* `Druidoo `_: + + * Iván Todorovich diff --git a/web_widget_image_webcam/readme/DESCRIPTION.rst b/web_widget_image_webcam/readme/DESCRIPTION.rst new file mode 100644 index 000000000..d5748de59 --- /dev/null +++ b/web_widget_image_webcam/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module extends the functionality of the image widget and allows to take snapshots with WebCam. diff --git a/web_widget_image_webcam/static/src/css/web_widget_image_webcam.css b/web_widget_image_webcam/static/src/css/web_widget_image_webcam.css index d631fe18d..241db3e02 100644 --- a/web_widget_image_webcam/static/src/css/web_widget_image_webcam.css +++ b/web_widget_image_webcam/static/src/css/web_widget_image_webcam.css @@ -1,13 +1,17 @@ /* Copyright 2016 Siddharth Bhalgami + Copyright 2019-Today: Druidoo () License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ .o_form_view.o_form_editable .o_form_field_image .o_form_image_controls .o_form_binary_file_web_cam { color: inherit; } +.o_field_widget.o_field_image .o_form_image_controls > .fa { + margin: 3px; +} .o_form_view .o_form_field_image .o_form_image_controls > .fa{ - margin:3px; + margin: 3px; } .live_webcam_outer_div, .webcam_result_outer_div { padding-left: 20px; diff --git a/web_widget_image_webcam/static/src/xml/web_widget_image_webcam.xml b/web_widget_image_webcam/static/src/xml/web_widget_image_webcam.xml index df50df2eb..adba186ff 100644 --- a/web_widget_image_webcam/static/src/xml/web_widget_image_webcam.xml +++ b/web_widget_image_webcam/static/src/xml/web_widget_image_webcam.xml @@ -1,5 +1,6 @@