app/views/tasks/_form.html.erb db/migrate/20080719122436_add_project_association_to_tasks.rb @@ -1,5 +1,12 @@ class Project < ActiveRecord::Base + has_many :tasks + validates_presence_of :name + # Returns projects for Rails form select helper + def self.find_for_select + self.all.collect { |p| [ p.name, p.id ] } + end + end app/models/project.rb @@ -1,5 +1,7 @@ class Task < ActiveRecord::Base + belongs_to :project + validates_presence_of :name, :due_on # Validates that due date for task cannot be in the past app/models/task.rb @@ -8,6 +8,15 @@ <%=h @project.description %> </p> +<h3>Tasks for this project:</h3> + +<ul> + <%- @project.tasks.each do |task| -%> + <li><%= link_to task.name, task %>, due on <%= task.due_on.to_s(:short) %></li> + <%- end -%> +</ul> + +<hr /> <%= link_to 'Edit', edit_project_path(@project) %> | <%= link_to 'Back', projects_path %> app/views/projects/show.html.erb @@ -3,18 +3,8 @@ <% form_for(@task) do |f| %> <%= f.error_messages %> - <p> - <%= f.label :name %><br /> - <%= f.text_field :name %> - </p> - <p> - <%= f.label :due_on %><br /> - <%= f.date_select :due_on %> - </p> - <p> - <%= f.label :completed %><br /> - <%= f.check_box :completed %> - </p> + <%= render :partial => "form", :locals => { :f => f } %> + <p> <%= f.submit "Update" %> </p> app/views/tasks/edit.html.erb @@ -3,18 +3,8 @@ <% form_for(@task) do |f| %> <%= f.error_messages %> - <p> - <%= f.label :name %><br /> - <%= f.text_field :name %> - </p> - <p> - <%= f.label :due_on %><br /> - <%= f.date_select :due_on %> - </p> - <p> - <%= f.label :completed %><br /> - <%= f.check_box :completed %> - </p> + <%= render :partial => "form", :locals => { :f => f } %> + <p> <%= f.submit "Create" %> </p> app/views/tasks/new.html.erb @@ -13,6 +13,7 @@ <%=h @task.completed %> </p> +<p>Belongs to project: <strong><%= @task.project.blank? ? 'N/A' : link_to(@task.project.name, @task.project) %></strong></p> <%= link_to 'Edit', edit_task_path(@task) %> | <%= link_to 'Back', tasks_path %> app/views/tasks/show.html.erb @@ -1,10 +1,9 @@ ActionController::Routing::Routes.draw do |map| - map.resources :projects - - - map.resources :tasks map.root :controller => "tasks" + + map.resources :tasks + map.resources :projects # The priority is based upon order of creation: first created -> highest priority. config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20080719113143) do +ActiveRecord::Schema.define(:version => 20080719122436) do create_table "projects", :force => true do |t| t.string "name" @@ -24,6 +24,7 @@ ActiveRecord::Schema.define(:version => 20080719113143) do t.boolean "completed" t.datetime "created_at" t.datetime "updated_at" + t.integer "project_id" end end db/schema.rb f559aa19d488509aa5cac41a9025dd5bddbaf271 Karel Minarik karmi@karmi.cz http://github.com/karmi/workshop_tutorial_application/commit/8763fd03a94d29a506aca01334c4ef832bcb961d 8763fd03a94d29a506aca01334c4ef832bcb961d 2008-07-19T07:31:16-07:00 2008-07-19T07:31:16-07:00 Added association between Tasks and Projects; Refactored form for Tasks to use partial template 0d54a9c1ca8bfb6f142009d5c79027d8d9e7365f Karel Minarik karmi@karmi.cz