Download as
Browse Code »

Commit 687f3e11288deaae1c00b7e91b19270c70500f7e

Authored by Daniela Feitosa
2 parents e2e6ea01 8838b42c
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge commit 'refs/merge-requests/211' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/211
Showing 3 changed files with 21 additions and 4 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @687f3e1
@@ -21,12 +21,11 @@ class User < ActiveRecord::Base @@ -21,12 +21,11 @@ class User < ActiveRecord::Base
21 end 21 end
22 end 22 end
23 23
24 - before_create :make_activation_code  
25 -  
26 before_create do |user| 24 before_create do |user|
27 if user.environment.nil? 25 if user.environment.nil?
28 user.environment = Environment.default 26 user.environment = Environment.default
29 end 27 end
  28 + user.send(:make_activation_code) if !user.environment.enabled?('skip_new_user_email_confirmation')
30 end 29 end
31 30
32 after_create do |user| 31 after_create do |user|
@@ -35,7 +34,7 @@ class User < ActiveRecord::Base @@ -35,7 +34,7 @@ class User < ActiveRecord::Base
35 user.person.name ||= user.login 34 user.person.name ||= user.login
36 user.person.visible = false unless user.activated? 35 user.person.visible = false unless user.activated?
37 user.person.save! 36 user.person.save!
38 - if user.environment && user.environment.enabled?('skip_new_user_email_confirmation') 37 + if user.environment.enabled?('skip_new_user_email_confirmation')
39 user.activate 38 user.activate
40 end 39 end
41 end 40 end
@@ -117,7 +116,7 @@ class User < ActiveRecord::Base @@ -117,7 +116,7 @@ class User < ActiveRecord::Base
117 self.activated_at = Time.now.utc 116 self.activated_at = Time.now.utc
118 self.activation_code = nil 117 self.activation_code = nil
119 self.person.visible = true 118 self.person.visible = true
120 - self.person.save! && self.save 119 + self.person.save! && self.save!
121 end 120 end
122 121
123 def activated? 122 def activated?
db/migrate/20120813163139_set_activation_code_to_nil_if_already_activated.rb 0 → 100644
  Diff comments   View file @687f3e1
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class SetActivationCodeToNilIfAlreadyActivated < ActiveRecord::Migration
  2 + def self.up
  3 + update("UPDATE users SET activation_code = ? WHERE activated_at IS NOT NULL")
  4 + end
  5 +
  6 + def self.down
  7 + say('Can not be reverted.')
  8 + end
  9 +end
test/functional/account_controller_test.rb
  Diff comments   View file @687f3e1
@@ -610,6 +610,15 @@ class AccountControllerTest &lt; ActionController::TestCase @@ -610,6 +610,15 @@ class AccountControllerTest &lt; ActionController::TestCase
610 assert_equal 'example.com', Person['testuser'].organization 610 assert_equal 'example.com', Person['testuser'].organization
611 end 611 end
612 612
  613 + should 'activate user after signup if environment is set to skip confirmation' do
  614 + env = Environment.default
  615 + env.enable('skip_new_user_email_confirmation')
  616 + env.save!
  617 + new_user(:login => 'activated_user')
  618 + user = User.find_by_login('activated_user')
  619 + assert user.activated?
  620 + end
  621 +
613 should 'redirect to initial page after logout' do 622 should 'redirect to initial page after logout' do
614 login_as :johndoe 623 login_as :johndoe
615 get :logout 624 get :logout