Skip to content

Commit

Permalink
plants of a family with calendar
Browse files Browse the repository at this point in the history
  • Loading branch information
chrigu committed Jul 17, 2011
1 parent 8dea91e commit bb6bb6c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 33 deletions.
3 changes: 1 addition & 2 deletions app/views/families/show.html.haml
Expand Up @@ -11,8 +11,7 @@
= @family.field_state
%p
%b Pflanzen:
- @family.plants.each do |plant|
= plant.name
= render :partial => 'plants/plant_year', :locals => { :plants => @family.plants, :with_header => true, :with_plant_name => true}

= link_to 'Edit', edit_family_path(@family)
|
Expand Down
28 changes: 0 additions & 28 deletions app/views/families/show_old.html.erb

This file was deleted.

4 changes: 1 addition & 3 deletions features/step_definitions/add_plants_to_a_bed_steps.rb
@@ -1,7 +1,5 @@
def scan_to_a s
res = []
res = s.scan(/\w+/)
res
s.scan(/\w+/)
end

Given /^A bed with name "([^"]*)" and field state "([^"]*)"$/ do |name, field|
Expand Down

0 comments on commit bb6bb6c

Please sign in to comment.