Changeset 298

Timestamp:

03/01/06 13:47:00 (3 years ago)

Author:

lazyatom

Message:

Mergedge rb_1.0 (r296) changes into trunk

Files:

• login_engine/trunk/README (modified) (1 diff)
• login_engine/trunk/app/controllers/user_controller.rb (modified) (1 diff)

login_engine/trunk/README

@@ -294 +294 @@
-
-Currently, since not all databases appear to support structure cloning, the tests will load the entire schema into your test database, potentially blowing away any other test structures you might have. If this presents an issue for your application, comment out the line in test/test_helper.rb
-
-
-= Database Schema Details
-
-You need a database table corresponding to the User model. This is provided as a Rails Schema file, but the schema is presented below for information. Note the table type for MySQL. Whatever DB you use, it must support transactions. If it does not, the functional tests will not work properly, nor will the application in the face of failures during certain DB creates and updates.
-
-  mysql syntax:
-  CREATE TABLE users (
-    id INTEGER UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    login VARCHAR(80) NOT NULL,
-    salted_password VARCHAR(40) NOT NULL,
-    email VARCHAR(60) NOT NULL,
-    firstname VARCHAR(40),
-    lastname VARCHAR(40),
-    salt CHAR(40) NOT NULL,
-    verified INT default 0,
-    role VARCHAR(40) default NULL,
-    security_token CHAR(40) default NULL,
-    token_expiry DATETIME default NULL,
-    deleted INT default 0,
-    delete_after DATETIME default NULL
-  ) TYPE=InnoDB DEFAULT CHARSET=utf8;
-
-  postgres:
-  CREATE TABLE "users" (
-    id SERIAL PRIMARY KEY
-    login VARCHAR(80) NOT NULL,
-    salted_password VARCHAR(40) NOT NULL,
-    email VARCHAR(60) NOT NULL,
-    firstname VARCHAR(40),
-    lastname VARCHAR(40),
-    salt CHAR(40) NOT NULL,
-    verified INT default 0,
-    role VARCHAR(40) default NULL,
-    security_token CHAR(40) default NULL,
-    token_expiry TIMESTAMP default NULL,
-    deleted INT default 0,
-    delete_after TIMESTAMP default NULL
-  ) WITH OIDS;
-
-  sqlite:
-  CREATE TABLE 'users' (
-    id INTEGER PRIMARY KEY,
-    login VARCHAR(80) NOT NULL,
-    salted_password VARCHAR(40) NOT NULL,
-    email VARCHAR(60) NOT NULL,
-    firstname VARCHAR(40),
-    lastname VARCHAR(40),
-    salt CHAR(40) NOT NULL,
-    verified INT default 0,
-    role VARCHAR(40) default NULL,
-    security_token CHAR(40) default NULL,
-    token_expiry DATETIME default NULL,
-    deleted INT default 0,
-    delete_after DATETIME default NULL
-  );
-
-Of course your user model can have any amount of extra fields. This is just a starting point.

login_engine/trunk/app/controllers/user_controller.rb

@@ -133 +133 @@
-    # Email disabled... we are unable to provide the password
-    if !LoginEngine.config(:use_email_notification)
-trieve
+set
-      redirect_back_or_default :action => 'login'
-      return