Merge lp:~openerp-commiter/openobject-addons/trunk-bug-943173-pna into lp:openobject-addons

[Pinakin Nayi (OpenERP)]

Hello ,

The openobject-addon bug/943173 is Fix

Thanks,
pna

[Fabien (Open ERP) (fp-tinyerp)]

already fixed in trunk

Unmerged revisions

6874. By Pinakin Nayi (OpenERP) on 2012-06-07

[FIX] auth_openid:auth_openid(need to backport from 6.1)

=== modified file 'auth_openid/controllers/main.py'
--- auth_openid/controllers/main.py	2012-02-13 15:27:55 +0000
+++ auth_openid/controllers/main.py	2012-06-07 11:43:22 +0000
@@ -199,7 +199,7 @@
                         # TODO fill empty fields with the ones from sreg/ax
                         cr.commit()
 
-                        u = req.session.login(dbname, login, key)
+                        u = req.session.authenticate(dbname, login, key, {} )
 
             if not user_id:
                 session['message'] = 'This OpenID identifier is not associated to any active users'

=== modified file 'auth_openid/static/src/css/openid.css'
--- auth_openid/static/src/css/openid.css	2012-02-13 15:27:55 +0000
+++ auth_openid/static/src/css/openid.css	2012-06-07 11:43:22 +0000
@@ -1,9 +1,9 @@
-.login .pane {
+.oe_login .oe_login_pane {
     width: 260px;
     height: 175px;
 }
 
-.login .pane input[name='openid_url'] {
+.oe_login .oe_login_pane input[name='openid_url'] {
     background: #fff url(../img/login-bg.gif) no-repeat 1px;
     padding-left: 20px;
 }

=== modified file 'auth_openid/static/src/js/auth_openid.js'
--- auth_openid/static/src/js/auth_openid.js	2012-02-13 15:27:55 +0000
+++ auth_openid/static/src/js/auth_openid.js	2012-06-07 11:43:22 +0000
@@ -8,7 +8,7 @@
         this._super.apply(this, arguments);
         var self = this;
 
-        this._default_error_message = this.$element.find('.login_error_message').text();
+        this._default_error_message = this.$element.find('.oe_login_error_message').text();
 
         this.$openid_selected_button = $();
         this.$openid_selected_input = $();

=== modified file 'auth_openid/static/src/xml/auth_openid.xml'
--- auth_openid/static/src/xml/auth_openid.xml	2012-02-13 15:27:55 +0000
+++ auth_openid/static/src/xml/auth_openid.xml	2012-06-07 11:43:22 +0000
@@ -3,7 +3,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-extend="Login">
-        <t t-jquery=".login .pane div#logo" t-operation="after">
+        <t t-jquery=".oe_login .oe_login_pane .oe_login_logo" t-operation="after">
             <ul class="openid_providers">
                 <li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
                 <li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
@@ -31,7 +31,7 @@
         </t>
     </t>
     <t t-extend="Login">
-        <t t-jquery=".login .pane form ul li:nth-child(4)" t-operation="after">
+        <t t-jquery=".oe_login .oe_login_pane form ul li:nth-child(4)" t-operation="after">
             <li>
                 Google Apps Domain
             </li>
@@ -54,7 +54,7 @@
     </t>
 
     <t t-extend="Login">
-        <t t-jquery=".login .pane form ul li:has(input)">
+        <t t-jquery=".oe_login .oe_login_pane form ul li:has(input)">
             this.each(function() {
                 var $i = $(this),
                     dp = $i.find('input').attr('name');