Changeset 274 for Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js

Timestamp:

02/20/12 16:27:19 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• [Client] Moved pages in subtree of rft/, allowing controllers next to them.
• [Client] Created questions page, gives overview and allows adding.
• [Client] Page controllers inherit from _Page, because the previous mechanism w

asn't working.

• [Client] Added new user registration.
• [Server] Changed user passwords to passwordHash/passwordSalt combination.
• [Server] Added simple object marshalling and unmarshalling to preserve types.
• [Server] Added ResearchToolObjectInterface? with static create() method. Implemented for all model classes.

File:

• Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js (modified) (3 diffs)

Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js

@@ -6 +6 @@
             templateString: template,
             widgetsInTemplate: true,
-            title: "Login",
+            title: "Login/Register",
             baseClass: "rftLoginDialog",
             startup: function() {
@@ -20 +20 @@
                 this.loginErrors.innerHTML = '';
                 var data = this.loginForm.get('value');
-                auth.login(data.username,data.password)
+                auth.login(data.email,data.password)
                 .then(lang.hitch(this,function() {
                     this.hide();
@@ -29 +29 @@
                 event.stop(evt);
                 return false;
+            },
+            onRegister: function() {
+                this.loginErrors.innerHTML = '';
+                var data = this.loginForm.get('value');
+                auth.register(data.email,data.password)
+                .then(lang.hitch(this,function() {
+                    this.hide();
+                    content.initial();
+                }),lang.hitch(this,function() {
+                    this.loginErrors.innerHTML = 'Register failed.';
+                }));
             }
         });