@@ -25,6 +25,7 @@ class PeopleController < ApplicationController # GET /people/new.xml def new @person = Person.new + 3.times { @person.phones.build } respond_to do |format| format.html # new.html.erb app/controllers/people_controller.rb @@ -1,2 +1,7 @@ module PeopleHelper + def add_phone_link label + link_to_function label do |page| + page.insert_html :bottom, :phones, :partial => 'shared/phone', :object => Phone.new + end + end end app/helpers/people_helper.rb @@ -1,7 +1,30 @@ class Person < ActiveRecord::Base - has_many :phones + has_many :phones, :dependent => :destroy + after_update :save_phones + validates_associated :phones def name [self.first_name, self.last_name].join(" ") end + + def phone_attributes=(phone_attributes) + phone_attributes.each do |attributes| + if attributes[:id].blank? + phones.build(attributes) + else + phone = phones.detect { |p| p.id == attributes[:id].to_i } + phone.attributes = attributes + end + end + end + + def save_phones + phones.each do |p| + if t.should_destroy? + p.destroy + else + p.phone(false) + end + end + end end app/models/person.rb @@ -1,6 +1,17 @@ class Phone < ActiveRecord::Base belongs_to :person + attr_accessor :should_destroy - validates_length_of :number, :is => 10 - validates_inclusion_of :label, :in => ["home", "mobile", "work", "fax"], :message => "must be either 'home', 'mobile', 'work' or 'fax'" + validates_length_of :number, + :is => 10, + :allow_nil => true + + validates_inclusion_of :label, + :in => ["home", "mobile", "work", "fax"], + :allow_nil => true, + :message => "must be either 'home', 'mobile', 'work' or 'fax'" + + def should_destroy? + should_destroy.to_i == 1 + end end app/models/phone.rb @@ -21,13 +21,13 @@ <li><%= link_to 'List People', '/', :class => ('current' if (controller.controller_name == 'people' and controller.action_name == 'index')) %></li> <li><%= link_to 'Add a Person', new_person_path, :class => ('current' if (controller.controller_name == 'people' and controller.action_name == 'new')) %></li> <%- if controller.controller_name == 'people' and controller.action_name == 'show' or controller.action_name == 'edit' -%> - <li><%= link_to(@person.name, person_path(@person), :class => 'current') %></li> + <li><%= link_to((controller.action_name == "edit" ? "Editing " : "") + @person.name, person_path(@person), :class => 'current') %></li> <%- end -%> </ul> </div> </div> - <div id="content"> + <div id="content" class="clearfix"> <% if !flash.empty? %> <% flash.keys.each do |msgtype| %> <p class="flash_<%= msgtype.to_s %>"><%= flash[msgtype] %></p> app/views/layouts/application.rhtml @@ -1,36 +1,48 @@ -<h1>Editing person</h1> - <% form_for(@person) do |f| %> <%= f.error_messages %> +<div id="form_container" class="clearfix"> + + <div id="form_left"> + <p> + <%= f.label :first_name %><br /> + <%= f.text_field :first_name %> + </p> + <p> + <%= f.label :last_name %><br /> + <%= f.text_field :last_name %> + </p> + <p> + <%= f.label :email %><br /> + <%= f.text_field :email %> + </p> + <p> + <%= f.label :company_url %><br /> + <%= f.text_field :company_url %> + </p> + <p> + <%= f.label :company %><br /> + <%= f.text_field :company %> + </p> + <p> + <%= f.label :title %><br /> + <%= f.text_field :title %> + </p> + </div> + + <div id="form_right"> + <div id="phones"> + <%= render :partial => 'shared/phone', :collection => @person.phones %> + </div> + + <%= add_phone_link "Add a phone" %> + </div> + +</div> + +<div id="controls"> <p> - <%= f.label :first_name %><br /> - <%= f.text_field :first_name %> - </p> - <p> - <%= f.label :last_name %><br /> - <%= f.text_field :last_name %> - </p> - <p> - <%= f.label :email %><br /> - <%= f.text_field :email %> - </p> - <p> - <%= f.label :company_url %><br /> - <%= f.text_field :company_url %> - </p> - <p> - <%= f.label :company %><br /> - <%= f.text_field :company %> - </p> - <p> - <%= f.label :title %><br /> - <%= f.text_field :title %> - </p> - <p> - <%= f.submit "Update" %> + <%= f.submit "Update" %> <%= link_to 'Back', people_path %> </p> -<% end %> - -<%= link_to 'Show', @person %> | -<%= link_to 'Back', people_path %> +</div> +<% end %> \ No newline at end of file app/views/people/edit.html.erb @@ -3,33 +3,50 @@ <% form_for(@person) do |f| %> <%= f.error_messages %> +<div id="form_container" class="clearfix"> + + <div id="form_left"> + <p> + <%= f.label :first_name %><br /> + <%= f.text_field :first_name %> + </p> + <p> + <%= f.label :last_name %><br /> + <%= f.text_field :last_name %> + </p> + <p> + <%= f.label :email %><br /> + <%= f.text_field :email %> + </p> + <p> + <%= f.label :company_url %><br /> + <%= f.text_field :company_url %> + </p> + <p> + <%= f.label :company %><br /> + <%= f.text_field :company %> + </p> + <p> + <%= f.label :title %><br /> + <%= f.text_field :title %> + </p> + </div> + + <div id="form_right"> + <div id="phones"> + <%= render :partial => 'shared/phone', :collection => @person.phones %> + </div> + + <%= add_phone_link "Add a phone" %> + </div> + +</div> + +<div id="controls"> <p> - <%= f.label :first_name %><br /> - <%= f.text_field :first_name %> - </p> - <p> - <%= f.label :last_name %><br /> - <%= f.text_field :last_name %> - </p> - <p> - <%= f.label :email %><br /> - <%= f.text_field :email %> - </p> - <p> - <%= f.label :company_url %><br /> - <%= f.text_field :company_url %> - </p> - <p> - <%= f.label :company %><br /> - <%= f.text_field :company %> - </p> - <p> - <%= f.label :title %><br /> - <%= f.text_field :title %> - </p> - <p> - <%= f.submit "Create" %> + <%= f.submit "Create" %> <%= link_to 'Back', people_path %> </p> +</div> <% end %> -<%= link_to 'Back', people_path %> + app/views/people/new.html.erb @@ -1,2 +1,7 @@ // Place your application-specific JavaScript functions and classes here // This file is automatically included by javascript_include_tag :defaults + +function mark_for_destroy(element) { + $(element).next('.should_destroy').value = 1; + $(element).up('.task').hide(); +} \ No newline at end of file public/javascripts/application.js @@ -191,9 +191,35 @@ a:hover { -/*****************/ +/******************/ /* Flash styles */ -/*****************/ +/******************/ + +div#form_container { + background: #EAEAEA; + border: 1px solid #909090; + width: 600px; + margin: 15px 0; + padding: 0 15px; + } + +div#form_left { + float: left; + } + +div#form_right { + float: left; + margin-left: 20px; + } + +div#controls { + clear: both; + } + + +/******************/ +/* Flash styles */ +/******************/ p.flash_notice, p.flash_error { public/stylesheets/default.css public/.DS_Store 400af4b809bc9a0d96330e948f553365713658dc Ryan L. Cross rcross@cylenceweb.com http://github.com/cylence/spamstr-rails/commit/7f21864e4b11cfc19bb39aafa2e6b93e56769c5a 7f21864e4b11cfc19bb39aafa2e6b93e56769c5a 2008-09-17T16:18:15-07:00 2008-09-17T16:18:15-07:00 Committing unfinished changes to People New/Edit forms 9d20ace3db8512a388dbef4127b58eb2a591d8ea Ryan L. Cross rcross@cylenceweb.com