Mercurial > hg > soundsoftware-site
comparison app/models/.svn/text-base/user.rb.svn-base @ 14:1d32c0a0efbf
* Update to SVN trunk (revisions 3892-4040)
author | Chris Cannam |
---|---|
date | Wed, 25 Aug 2010 16:30:24 +0100 |
parents | cca12e1c1fd4 |
children | 40f7cfd4df19 |
comparison
equal
deleted
inserted
replaced
4:9cc62779c13a | 14:1d32c0a0efbf |
---|---|
160 self.status == STATUS_REGISTERED | 160 self.status == STATUS_REGISTERED |
161 end | 161 end |
162 | 162 |
163 def locked? | 163 def locked? |
164 self.status == STATUS_LOCKED | 164 self.status == STATUS_LOCKED |
165 end | |
166 | |
167 def activate | |
168 self.status = STATUS_ACTIVE | |
169 end | |
170 | |
171 def register | |
172 self.status = STATUS_REGISTERED | |
173 end | |
174 | |
175 def lock | |
176 self.status = STATUS_LOCKED | |
177 end | |
178 | |
179 def activate! | |
180 update_attribute(:status, STATUS_ACTIVE) | |
181 end | |
182 | |
183 def register! | |
184 update_attribute(:status, STATUS_REGISTERED) | |
185 end | |
186 | |
187 def lock! | |
188 update_attribute(:status, STATUS_LOCKED) | |
165 end | 189 end |
166 | 190 |
167 def check_password?(clear_password) | 191 def check_password?(clear_password) |
168 if auth_source_id.present? | 192 if auth_source_id.present? |
169 auth_source.authenticate(self.login, clear_password) | 193 auth_source.authenticate(self.login, clear_password) |