Download as
Browse Code »

Commit 873120cefa81d0b94f22db7db142680da9a15c4b

Authored by Daniela Feitosa
1 parent 687f3e11
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Added new db/schema.rb 

Also replaced "if !" by "unless"
Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @873120c
@@ -25,7 +25,7 @@ class User < ActiveRecord::Base @@ -25,7 +25,7 @@ class User < ActiveRecord::Base
25 if user.environment.nil? 25 if user.environment.nil?
26 user.environment = Environment.default 26 user.environment = Environment.default
27 end 27 end
28 - user.send(:make_activation_code) if !user.environment.enabled?('skip_new_user_email_confirmation') 28 + user.send(:make_activation_code) unless user.environment.enabled?('skip_new_user_email_confirmation')
29 end 29 end
30 30
31 after_create do |user| 31 after_create do |user|
db/migrate/20120813163139_set_activation_code_to_nil_if_already_activated.rb
  Diff comments   View file @873120c
1 class SetActivationCodeToNilIfAlreadyActivated < ActiveRecord::Migration 1 class SetActivationCodeToNilIfAlreadyActivated < ActiveRecord::Migration
2 def self.up 2 def self.up
3 - update("UPDATE users SET activation_code = ? WHERE activated_at IS NOT NULL") 3 + update("UPDATE users SET activation_code = null WHERE activated_at IS NOT NULL")
4 end 4 end
5 5
6 def self.down 6 def self.down
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 # 9 #
10 # It's strongly recommended to check this file into your version control system. 10 # It's strongly recommended to check this file into your version control system.
11 11
12 -ActiveRecord::Schema.define(:version => 20120411132751) do 12 +ActiveRecord::Schema.define(:version => 20120813163139) do
13 13
14 create_table "abuse_reports", :force => true do |t| 14 create_table "abuse_reports", :force => true do |t|
15 t.integer "reporter_id" 15 t.integer "reporter_id"