From 1e267a64fbca2668b3666984212d7e54b7160edd Mon Sep 17 00:00:00 2001 From: MrYummy Date: Fri, 2 Jun 2017 18:26:48 +0200 Subject: Addded default badge 'none' and enforced badges --- app/models/user.rb | 2 +- db/migrate/20170319193517_add_badge_id_to_users.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 24e7a2d..52b7130 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -9,7 +9,7 @@ class User < ActiveRecord::Base has_secure_password - before_validation :strip_whitespaces, :set_uuid, :set_name, :set_email_token, :set_role + before_validation :strip_whitespaces, :set_uuid, :set_name, :set_email_token, :set_role, :set_badge validates_presence_of :password, :password_confirmation, :email_token, on: :create validates_presence_of :name, :email, :ign diff --git a/db/migrate/20170319193517_add_badge_id_to_users.rb b/db/migrate/20170319193517_add_badge_id_to_users.rb index 4e9d7ed..19b58de 100644 --- a/db/migrate/20170319193517_add_badge_id_to_users.rb +++ b/db/migrate/20170319193517_add_badge_id_to_users.rb @@ -7,6 +7,7 @@ class AddBadgeIdToUsers < ActiveRecord::Migration t.string "color" end + Badge.create!({name: "none", symbol: "", color: "#000"}) dbadge = Badge.create!({name: "donor", symbol: "$", color: "#f60"}) add_column :users, :badge_id, :integer, default: 0 -- cgit v1.2.3