diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:18:18 +0100 |
| commit | b483a17c13ba8e273949ce4ee8c8c05e66b06647 (patch) | |
| tree | 3e928fa68c3edb90c0666ec52ad8c9982f9dab77 /perllib/FixMyStreet/DB/Result/User.pm | |
| parent | 8deb709fa2d44bcbaba54734f7f4f4385980d8df (diff) | |
| parent | 62ffebc89cc66d32a828ea1de8c850c3e950faa1 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/DB/Result/Comment.pm
perllib/FixMyStreet/DB/Result/User.pm
web/css/core.css
Diffstat (limited to 'perllib/FixMyStreet/DB/Result/User.pm')
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/User.pm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm index dfcb18c5b..c0b078775 100644 --- a/perllib/FixMyStreet/DB/Result/User.pm +++ b/perllib/FixMyStreet/DB/Result/User.pm @@ -8,7 +8,7 @@ use warnings; use base 'DBIx::Class::Core'; -__PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime"); +__PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("users"); __PACKAGE__->add_columns( "id", @@ -54,6 +54,16 @@ __PACKAGE__->has_many( # Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-22 16:10:43 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zQIniwAXjl5Lh9wyiGuwFw +__PACKAGE__->add_columns( + "password" => { + encode_column => 1, + encode_class => 'Crypt::Eksblowfish::Bcrypt', + encode_args => { cost => 8 }, + encode_check_method => 'check_password', + }, +); +>>>>>>> 62ffebc89cc66d32a828ea1de8c850c3e950faa1 + use mySociety::EmailUtil; =head2 check_for_errors |