@@ -1,4 +1,6 @@ class Mistake < ActiveRecord::Base belongs_to :performance belongs_to :mistake_type + + attr_accessor :description end \ No newline at end of file app/models/mistake.rb @@ -1,2 +1,4 @@ class Performance < ActiveRecord::Base + belongs_to :user + has_many :mistakes end app/models/performance.rb @@ -136,4 +136,29 @@ <p> <%= link_to "Done", performances_path %> -</p> \ No newline at end of file +</p> + +<div id="mistakes"> + <h2> + <%= t(:mistakes) %> + </h2> + + <% if @performance.mistakes.blank? %> + <p> + <em><%= t(:'mistake.no_mistakes') %></em> + </p> + <% else %> + <ul> + + </ul> + <% end %> + + <% form_for Mistake.new, :url => performance_mistakes_path(@performance) do |form| %> + <p> + <%= form.label :description %> + <%= form.text_field :description %> + <%= form.submit "Add mistake" %> + </p> + <% end %> +</div> + app/views/performances/_form.erb @@ -2,6 +2,9 @@ # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. en: + mistakes: Mistakes + mistake: + no_mistakes: No mistakes create: Create Add: Add performances: config/locales/en.yml @@ -1,5 +1,9 @@ ActionController::Routing::Routes.draw do |map| - map.resources :users, :performances + map.resources :users + + map.resources :performances do |perf| + perf.resources :mistakes + end # config/routes.rb map.resource :user_session config/routes.rb @@ -19,6 +19,9 @@ PerformanceForm = Behavior.create({ var perfId = response.responseText; this.element.action = this.element.action + '/' + perfId; this.element.down('div').insert($input({type: 'hidden', value: 'put', name: '_method'})); + + $('new_mistake').action = '/performances/' + perfId + '/mistakes'; + this.updating = true; } @@ -27,5 +30,6 @@ PerformanceForm = Behavior.create({ }); Event.addBehavior({ - '#edit_performance' : PerformanceForm + '#edit_performance' : PerformanceForm, + '#new_mistake' : Remote.Form }); \ No newline at end of file public/javascripts/performances/show.js c6fc0fbbca55ff6f0bb4ea0fd2a71c8f557e38bd Jarkko Laine jarkko@jlaine.net http://github.com/jarkko/teamgeist/commit/5f0fd82929c97c08ac140fa7bef6a4a639c1acb6 5f0fd82929c97c08ac140fa7bef6a4a639c1acb6 2009-03-29T10:33:43-07:00 2009-03-29T10:33:43-07:00 Added first stint at mistake form to the performance form page. 3986e47541b6c51052dbcfce7571f6cad5e2f01a Jarkko Laine jarkko@jlaine.net