Skip to content

Commit

Permalink
[#519 state:resolved] BREAKING!
Browse files Browse the repository at this point in the history
The message "You must activate your account before you can log
in. Please check your email." which used to be added to the flash
message when a user has signed up has been removed from
`hobo_do_signup`.
  • Loading branch information
bryanlarsen committed Nov 26, 2009
1 parent 7c4d64c commit 2120168
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
11 changes: 10 additions & 1 deletion hobo/CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ Deletions:
- The bundles feature of Hobo which never really worked and was
never documented has been removed from this release.

- The message "You must activate your account before you can log
in. Please check your email." which used to be added to the flash
message when a user has signed up has been removed from
`hobo_do_signup`.

Major enhancements:

- `rake hobo:run_invite_only_generators` was added as an alternative
Expand All @@ -40,7 +45,11 @@ Major enhancements:
representation is still used in view mode. The editor tag for
HTML columns has been modified to remove the heavy sanitizing that
was previously performed. HtmlString will sanitize before saving
to the database.
to the database. You need to update your hobo-rapid.js for this
fix. Run `rake hobo:run_standard_generators` or copy the file
directly from
http://github.com/tablatom/hobo/blob/master/hobo/rails_generators/hobo_rapid/templates/hobo-rapid.js


Major bug fixes:

Expand Down
5 changes: 1 addition & 4 deletions hobo/lib/hobo/user_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,9 @@ def hobo_do_signup(&b)
do_creator_action(:signup) do
if valid?
flash[:notice] = ht(:"users.messages.signup.success", :default=>["Thanks for signing up!"])
flash[:notice] << ht(:"users.messages.signup.must_activate", :default=>[" You must activate your account before you can log in. Please check your email."]) unless this.account_active?
end
response_block(&b) or if valid?
if this.account_active?
self.current_user = this if this.account_active?
end
self.current_user = this if this.account_active?
redirect_back_or_default(home_page)
end
end
Expand Down

0 comments on commit 2120168

Please sign in to comment.