gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add IRC nick to the Person page

Browse source
This commit is contained in:
Matt Barringer 2013-02-11 18:10:43 +01:00
parent 93b7d17e23
commit 4b0887e0f3
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/person.rb
View file

@ -1,5 +1,5 @@
class Person < ActiveRecord::Base class Person < ActiveRecord::Base
attr_accessible :email, :first_name, :last_name, :public_name, :biography, :company, :avatar attr_accessible :email, :first_name, :last_name, :public_name, :biography, :company, :avatar, :irc_nickname
has_many :event_people, :dependent => :destroy has_many :event_people, :dependent => :destroy
has_many :events, :through => :event_people, :uniq => true has_many :events, :through => :event_people, :uniq => true

1
app/views/devise/registrations/edit.html.haml
View file

@ -4,6 +4,7 @@
= f.inputs :name => "Profile" do = f.inputs :name => "Profile" do
= f.fields_for :person do |p| = f.fields_for :person do |p|
= p.inputs :first_name, :last_name, :public_name = p.inputs :first_name, :last_name, :public_name
= p.input :irc_nickname, :label => "IRC nick:"
= p.input :company, :label => "Affiliation", :hint => "This could be a company, a user group, or nothing at all." = p.input :company, :label => "Affiliation", :hint => "This could be a company, a user group, or nothing at all."
= image_tag current_user.person.avatar(:small) = image_tag current_user.person.avatar(:small)
= p.input :avatar, :label => "Picture", :hint => "Upload a new picture." = p.input :avatar, :label => "Picture", :hint => "Upload a new picture."

15
db/schema.rb
View file

@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20130202131932) do ActiveRecord::Schema.define(:version => 20130211170728) do
create_table "call_for_papers", :force => true do |t| create_table "call_for_papers", :force => true do |t|
t.date "start_date", :null => false t.date "start_date", :null => false
@ -160,22 +160,23 @@ ActiveRecord::Schema.define(:version => 20130202131932) do
t.integer "user_id" t.integer "user_id"
t.datetime "created_at", :null => false t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
t.string "irc_nickname"
end end
create_table "registrations", :force => true do |t| create_table "registrations", :force => true do |t|
t.integer "person_id" t.integer "person_id"
t.integer "conference_id" t.integer "conference_id"
t.boolean "attending_social_events", :default => true t.boolean "attending_social_events", :default => true
t.boolean "attending_social_events_with_partner", :default => false t.boolean "attending_with_partner", :default => false
t.boolean "using_affiliated_lodging", :default => true t.boolean "using_affiliated_lodging", :default => true
t.datetime "arrival" t.datetime "arrival"
t.datetime "departure" t.datetime "departure"
t.text "additional_speakers" t.text "additional_speakers"
t.datetime "created_at", :null => false t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
t.integer "dietary_choice_id" t.integer "dietary_choice_id"
t.text "other_dietary_choice" t.text "other_dietary_choice"
t.boolean "handicapped_access_required", :default => false t.boolean "handicapped_access_required", :default => false
end end
create_table "roles", :force => true do |t| create_table "roles", :force => true do |t|