[MERGE]: Merged with lp:openobject-addons

bzr revid: atp@tinyerp.com-20120816052021-igdj7knaimwg9x7z

3 files changed, 27 insertions, 81 deletions

diff --git a/addons/auth_signup/static/src/css/auth_signup.css b/addons/auth_signup/static/src/css/auth_signup.css
deleted file mode 100644
index 1e8d7d9d8d8..00000000000
--- a/addons/auth_signup/static/src/css/auth_signup.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.openerp .oe_login .oe_login_pane ul.oe_signup a {
-  color: #eeeeee;
-  margin: 0 8px;
-}
-.openerp .oe_login .oe_login_pane ul.oe_signup a:hover {
-  text-decoration: underline;
-}
-
-
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 7384fe1e5f5..2ab13aa7598 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -1,65 +1,38 @@
 openerp.auth_signup = function(instance) {
+    instance.auth_signup = instance.auth_signup || {};
     var _t = instance.web._t;
 
     instance.web.Login.include({
         start: function() {
             var self = this;
-
             this.$('a.oe_signup').click(function() {
-                var db = self.$("form [name=db]").val();
-                if (!db) {
-                    self.do_warn(_t("Login"), _t("No database selected!"));
-                    return false;
-                }
-
-                var cnx = instance.connection;
-                if (cnx.session_is_valid()) {
-                    self._signup();
-                } else {
-                    cnx.session_authenticate(db, 'anonymous', 'anonymous', true).then(function() {
-                        self._signup();
-                    }).fail(function(error, event) {
-                        console.log(error);
-                        // cannot log as anonymous or auth_signup not installed
-                        self.do_warn(_t('Sign Up'), _.str.sprintf(_t('Signup functionnality is not available for database %s'), db), true);
-                    });
-                }
+                var dbname = self.$("form [name=db]").val();
+                self.do_action({
+                    type: 'ir.actions.client',
+                    tag: 'auth_signup.signup',
+                    params: {'dbname': dbname},
+                    target: 'new',
+                    name: 'Sign up'
+                });
                 return true;
             });
             return this._super();
-
         },
-
-        _signup: function() {
-            this.do_action({
-                type: 'ir.actions.client',
-                tag: 'auth_signup.signup',
-                target: 'new',
-                name: 'Sign up'
-            });
-        }
     });
 
 
-    instance.auth_signup = instance.auth_signup || {};
     instance.auth_signup.Signup = instance.web.Widget.extend({
         template: 'auth_signup.signup',
-        init: function() {
-            this._super.apply(this, arguments);
-            this.dataset = new instance.web.DataSet(this, 'auth.signup');
+        init: function(parent, params) {
+            this.params = params;
+            return this._super();
         },
         start: function() {
             var self = this;
-            this.$('input[type=password]').change(function() {
+            this.$('input[name=password_confirmation]').keyup(function() {
                 var v = $(this).val();
-                var e = !_.isEmpty(v);
-                if (e) {
-                    e =_.all(self.$('input[type=password]'), function(i) {
-                        return $(i).val() === v;
-                    });
-                }
                 var $b = self.$('button');
-                if (e) {
+                if (_.isEmpty(v) || self.$('input[name=password]').val() === v) {
                     $b.removeAttr('disabled');
                 } else {
                     $b.attr('disabled', 'disabled');
@@ -70,36 +43,18 @@ openerp.auth_signup = function(instance) {
                 if(ev) {
                     ev.preventDefault();
                 }
-                var name = self.$('input[name=name]').val();
-                var email = self.$('input[name=email]').val();
-                var password = self.$('input[name=password]').val();
-
-                self.dataset.create({
-                    name: name,
-                    email: email,
-                    password: password
-                }, function() {
-                    self.do_action({
-                        type: 'ir.actions.client',
-                        tag: 'login',
-                        params: {
-                            db: instance.connection.db,
-                            login: email,
-                            password: password,
-                            login_successful: function() {
-                                self.do_action('home');
-                            }
-                        }
-                    });
-                });
-                return false;
-
+                var params = {
+                    dbname : self.params.dbname,
+                    name: self.$('input[name=name]').val(),
+                    login: self.$('input[name=email]').val(),
+                    password: self.$('input[name=password]').val(),
+                };
+                var url = "/auth_signup/signup?" + $.param(params);
+                window.location = url;
             });
-            return $.when(this._super());
+            return this._super();
         }
-
     });
     instance.web.client_actions.add("auth_signup.signup", "instance.auth_signup.Signup");
 
-
 };
diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml
index 92343d96281..c2eec846d15 100644
--- a/addons/auth_signup/static/src/xml/auth_signup.xml
+++ b/addons/auth_signup/static/src/xml/auth_signup.xml
@@ -14,10 +14,10 @@
 <t t-name="auth_signup.signup">
   <div>
     <form>
-        Name = <input type="text" name="name"/>
-        Email = <input type="email" name="email"/>
-        Password = <input type="password" name="password"/>
-        Confirmation = <input type="password" name="password_confirmation"/>
+        Name = <input type="text" name="name"/><br/>
+        Email = <input type="email" name="email"/><br/>
+        Password = <input type="password" name="password"/><br/>
+        Confirmation = <input type="password" name="password_confirmation"/><br/>
         <button type="submit" disabled="disabled">Signup</button>
     </form>
   </div>