db/migrate/20091106203147_add_email_to_speakers.rb @@ -10,4 +10,6 @@ class Speaker < ActiveRecord::Base validates_presence_of :bio validates_presence_of :presentation validates_presence_of :description + validates_presence_of :email + validates_format_of :email, :with => User::EMAIL_REGEX, :if => proc { |obj| !obj.email.blank? } end app/models/speaker.rb @@ -10,8 +10,19 @@ class User < ActiveRecord::Base attr_accessible :name, :username, :email, :password, :password_confirmation + #TODO: kill this power feature def give_power self.role = "admin" self.save end + + #TODO: kill this power feature + def self.name_username_email_password_admin(name, username, email, password) + admin = User.create :name => name, + :username => username, + :email => email, + :password => password, + :password_confirmation => password + admin.give_power + end end app/models/user.rb @@ -16,6 +16,10 @@ <%= f.label :description, "Detalhes da palestra <span>(Textile)</span>" %><br /> <%= f.text_area :description %> </p> +<p> + <%= f.label :email, "Email" %><br /> + <%= f.text_field :email %> +</p> <p> <%= f.label :uploaded_data, "Foto" %><br /> app/views/admin/speakers/_form.html.erb @@ -12,5 +12,3 @@ </p> <p><%= f.submit "Confirmar" %></p> <% end %> - -<%= link_to "Registrar", new_user_path %> \ No newline at end of file app/views/user_sessions/new.html.erb @@ -4,7 +4,7 @@ ActionController::Routing::Routes.draw do |map| admin.resources :agendas end - map.resources :users, :as => "usuarios" + # map.resources :users, :as => "usuarios" map.resources :user_sessions, :as => "acesso" map.with_options :controller => 'user_sessions' do |user_sessions| config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20091106200600) do +ActiveRecord::Schema.define(:version => 20091106203147) do create_table "agendas", :force => true do |t| t.string "start_time" @@ -32,6 +32,7 @@ ActiveRecord::Schema.define(:version => 20091106200600) do t.string "content_type" t.datetime "created_at" t.datetime "updated_at" + t.string "email" end add_index "speakers", ["name"], :name => "index_speakers_on_name" db/schema.rb 3ee4c20c33a10466502df10ff2ac46ad345645fc tinogomes tinorj@gmail.com http://github.com/tinogomes/devinsampa/commit/c64b4e38f1588af2ebf758946016166214a11704 c64b4e38f1588af2ebf758946016166214a11704 2009-11-06T12:55:54-08:00 2009-11-06T12:55:54-08:00 removing user routes, added email for speaker, optional upload photo for speaker 091b472790e656d3bac0384cf157de05f953d3cd tinogomes tinorj@gmail.com