diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/base_setup/models/res_config_settings.py | 1 | ||||
| -rw-r--r-- | addons/base_setup/views/res_config_settings_views.xml | 11 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/widgets/widgets.js | 2 | ||||
| -rw-r--r-- | addons/web_editor/static/src/xml/editor.xml | 2 | ||||
| -rw-r--r-- | addons/website/models/res_users.py | 9 |
5 files changed, 23 insertions, 2 deletions
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py index 21d2087d12a..ef42b700bb4 100644 --- a/addons/base_setup/models/res_config_settings.py +++ b/addons/base_setup/models/res_config_settings.py @@ -30,6 +30,7 @@ class ResConfigSettings(models.TransientModel): module_inter_company_rules = fields.Boolean("Manage Inter Company") module_pad = fields.Boolean("Collaborative Pads") module_voip = fields.Boolean("Asterisk (VoIP)") + module_web_unsplash = fields.Boolean("Unsplash Image Library") company_share_partner = fields.Boolean(string='Share partners to all companies', help="Share your partners to all companies defined in your instance.\n" " * Checked : Partners are visible for every companies, even if a company is defined on the partner.\n" diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml index 53badf36843..1a418fd251c 100644 --- a/addons/base_setup/views/res_config_settings_views.xml +++ b/addons/base_setup/views/res_config_settings_views.xml @@ -233,6 +233,17 @@ </div> </div> </div> + <div class="col-xs-12 col-md-6 o_setting_box"> + <div class="o_setting_left_pane"> + <field name="module_web_unsplash" widget="upgrade_boolean"/> + </div> + <div class="o_setting_right_pane" id="web_unsplash_settings"> + <label for="module_web_unsplash"/> + <div class="text-muted"> + Find free high-resolution images from Unsplash + </div> + </div> + </div> </div> </div> </xpath> diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js index e2dc7ea73a7..5f00723865d 100644 --- a/addons/web_editor/static/src/js/widgets/widgets.js +++ b/addons/web_editor/static/src/js/widgets/widgets.js @@ -1103,6 +1103,7 @@ var MediaDialog = Dialog.extend({ }), custom_events: _.extend({}, Dialog.prototype.custom_events || {}, { save_request: '_onSaveRequest', + update_control_panel: '_updateControlPanel', }), /** @@ -1768,5 +1769,6 @@ return { MediaDialog: MediaDialog, LinkDialog: LinkDialog, CropImageDialog: CropImageDialog, + ImageWidget: ImageWidget, }; }); diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml index 7a8827a8ea2..3c3085bfe79 100644 --- a/addons/web_editor/static/src/xml/editor.xml +++ b/addons/web_editor/static/src/xml/editor.xml @@ -109,7 +109,7 @@ <span class="text-muted">— or —</span> <label for="imageurl">Add an image URL</label> <div class="form-group btn-group"> - <input type="text" class="form-control url pull-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 320px;"/> + <input type="text" class="form-control url pull-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/> <button type="button" class="btn btn-default o_upload_image_url_button" disabled="disabled">Add</button> </div> </div> diff --git a/addons/website/models/res_users.py b/addons/website/models/res_users.py index bab898d24c8..d8eb61d9e7c 100644 --- a/addons/website/models/res_users.py +++ b/addons/website/models/res_users.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import fields, models +from odoo import api, fields, models class ResUsers(models.Model): @@ -11,3 +11,10 @@ class ResUsers(models.Model): selection=lambda self: self._get_group_selection('base.module_category_website'), string='Website Editor', compute='_compute_groups_id', inverse='_inverse_groups_id', category_xml_id='base.module_category_website') + + @api.multi + def _has_unsplash_key_rights(self): + self.ensure_one() + if self.has_group('website.group_website_designer'): + return True + return super(ResUsers, self)._has_unsplash_key_rights() |