Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/testing #1

Open
wants to merge 2 commits into
base: 12.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified LICENSE
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ List of Social Networks supported:
- Pinterest
- Houzz

Version for Odoo 12
Available for Odoo 10 & 12
Version for Odoo 13
Available for Odoo 10, 12 & 13

---

Expand Down
Empty file modified __init__.py
100644 → 100755
Empty file.
13 changes: 5 additions & 8 deletions __manifest__.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
# -*- coding: utf-8 -*-
{
'name': "Website Social Extension",

'version': '13.0',
'depends': ['base', 'website'],
'summary': """
Extension for add more Social Networks to Odoo""",

'description': """
Extension for add more Social Networks to Odoo Website, like Bitbucket, Instagram, Vimeo, Whatsapp, Twitch, Reddit, etc.
""",

'author': "Moldeo Interactive",
'website': "https://www.moldeointeractive.com.ar",

'category': 'Website',
'version': '1.1',

'depends': ['base', 'website'],

'data': [
'views/views.xml',
],
'demo': [
],
'active': False,
'installable': True,
'application': False,
}
Binary file added __pycache__/__init__.cpython-37.pyc
Binary file not shown.
Empty file modified i18n/website_social.pot
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion models/__init__.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

from . import models
from . import website_social
Binary file added models/__pycache__/__init__.cpython-37.pyc
Binary file not shown.
Binary file added models/__pycache__/website_social.cpython-37.pyc
Binary file not shown.
32 changes: 0 additions & 32 deletions models/models.py

This file was deleted.

71 changes: 71 additions & 0 deletions models/website_social.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# -*- coding: utf-8 -*-

from odoo import models, fields, api

class WebsiteSocial(models.Model):
_inherit = 'website'

social_bitbucket = fields.Char('BitBucket Account')
social_vimeo = fields.Char('Vimeo Account')
social_whatsapp = fields.Char('Whatsapp Number')
social_skype = fields.Char('Skype Account')
social_twitch = fields.Char('Twitch Account')
social_reddit = fields.Char('Reddit Account')
social_tumblr = fields.Char('Tumblr Account')
social_flickr = fields.Char('Flickr Account')
social_pinterest = fields.Char('Pinterest Account')
social_houzz = fields.Char('Houzz Account')

social_instagram_username = fields.Char(
compute='_compute_social_instagram_username',
)

def _get_username_from_url(self, url):
return url and [p for p in url.split('/') if p][-1] or ''

@api.depends('company_id.social_instagram')
def _compute_social_instagram_username(self):
self.social_instagram_username = self._get_username_from_url( self.company_id.social_instagram)

class WebsiteSocialConfig(models.TransientModel):
_inherit = 'res.config.settings'

social_bitbucket = fields.Char(related='website_id.social_bitbucket', readonly=False)
social_vimeo = fields.Char(related='website_id.social_vimeo', readonly=False)
social_whatsapp = fields.Char(related='website_id.social_whatsapp', readonly=False)
social_skype = fields.Char(related='website_id.social_skype', readonly=False)
social_twitch = fields.Char(related='website_id.social_twitch', readonly=False)
social_reddit = fields.Char(related='website_id.social_reddit', readonly=False)
social_tumblr = fields.Char(related='website_id.social_tumblr', readonly=False)
social_flickr = fields.Char(related='website_id.social_flickr', readonly=False)
social_pinterest = fields.Char(related='website_id.social_pinterest', readonly=False)
social_houzz = fields.Char(related='website_id.social_houzz', readonly=False)

@api.depends('website_id', 'social_twitter', 'social_facebook', 'social_github', 'social_linkedin', 'social_youtube', 'social_instagram', 'social_bitbucket', 'social_vimeo', 'social_whatsapp', 'social_skype', 'social_twitch', 'social_reddit', 'social_tumblr', 'social_flickr','social_pinterest','social_houzz')
def has_social_network(self):
self.has_social_network = self.social_twitter or self.social_facebook or self.social_github \
or self.social_linkedin or self.social_youtube or self.social_instagram or self.social_bitbucket or self.social_vimeo \
or self.social_whatsapp or self.social_skype or self.social_twitch \
or self.social_reddit or self.social_tumblr or self.social_flickr \
or self.social_pinterest or self.social_houzz

def inverse_has_social_network(self):
if not self.has_social_network:
self.social_twitter = ''
self.social_facebook = ''
self.social_github = ''
self.social_linkedin = ''
self.social_youtube = ''
self.social_instagram = ''
self.social_bitbucket = ''
self.social_vimeo = ''
self.social_whatsapp = ''
self.social_skype = ''
self.social_twitch = ''
self.social_reddit = ''
self.social_tumblr = ''
self.social_flickr = ''
self.social_pinterest = ''
self.social_houzz = ''

has_social_network = fields.Boolean("Configure Social Network", compute=has_social_network, inverse=inverse_has_social_network)
Empty file modified static/description/icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified static/description/index.html
100644 → 100755
Empty file.
Binary file removed static/description/moldeo_interactive_logo.png
Binary file not shown.
11 changes: 5 additions & 6 deletions views/views.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>

<record id="website_social.extension" model="ir.ui.view">
<field name="name">Website Social Extension</field>
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="website.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div/div[@id='website_settings']/div[11]/div[@class='o_setting_right_pane']/div[@class='content-group']" position="inside">
<xpath expr="//field[@name='has_social_network']/../../div[@class='o_setting_right_pane']/div[@class='content-group']" position="inside">

<div class="row">
<label for="social_bitbucket" string="BitBucket" class="col-md-3 o_light_label"/>
<field name="social_bitbucket"/>
Expand Down Expand Up @@ -50,7 +50,7 @@
</xpath>
</field>
</record>

<!--
<record id="website_social_footer" model="ir.ui.view">
<field name="name">Website Social Footer</field>
<field name="inherit_id" ref="website.footer_custom"/>
Expand Down Expand Up @@ -88,7 +88,6 @@
</a>
</xpath>
</field>
</record>
</record> -->

</data>
</odoo>