diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py index 84a3b562133..84091a54347 100644 --- a/addons/portal/__openerp__.py +++ b/addons/portal/__openerp__.py @@ -25,6 +25,7 @@ 'depends' : [ 'base', 'share', + 'auth_anonymous', 'auth_signup', ], 'author' : 'OpenERP SA', @@ -45,8 +46,8 @@ very handy when used in combination with the module 'share'. 'data': [ 'security/portal_security.xml', 'security/ir.model.access.csv', - 'portal_view.xml', 'portal_data.xml', + 'portal_view.xml', 'wizard/portal_wizard_view.xml', 'wizard/share_wizard_view.xml', ], diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml index 58f2fc3e9d4..ddfb4cc6729 100644 --- a/addons/portal/portal_data.xml +++ b/addons/portal/portal_data.xml @@ -1,6 +1,6 @@ - + Portal @@ -10,7 +10,7 @@ - Company's news feed + Company's news @@ -32,24 +32,5 @@ form - - - - - - - - - - - - - diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index 831db25e26a..dd720d448ef 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -2,6 +2,25 @@ + + + + + + + + + + + + + Portal List diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index c15b995bff9..5bcb03aab33 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -270,6 +270,7 @@ openerp.web_linkedin = function(instance) { template: "LinkedIn.KeyWizard", init: function(parent, text) { this._super(parent, {title:_t("LinkedIn API Key")}); + this.api_domain = window.location.origin; }, start: function() { this._super(); diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml index 0d062e6fd8c..f114fa53803 100644 --- a/addons/web_linkedin/static/src/xml/linkedin.xml +++ b/addons/web_linkedin/static/src/xml/linkedin.xml @@ -41,8 +41,7 @@
  • Log into LinkedIn.
  • Add a new application and fill the form:
      -
    • JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com)
    • -
    • You can give multiple domain (e.g. yourcompany.my.openerp.com)
    • +
    • JavaScript API Domain:
    • The programming tool is Javascript