From 75eb0ab02f215afcb7b4e9d907bee412c38a91b2 Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Thu, 20 Dec 2012 12:02:11 +0000
Subject: [PATCH] Fix garden tabs in profile; embed "new garden" form.

---
 app/controllers/members_controller.rb     | 1 +
 app/views/members/show.html.haml          | 8 +++++---
 spec/views/members/show.html.haml_spec.rb | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index edca03b9c..49956b6d3 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -11,6 +11,7 @@ class MembersController < ApplicationController
   def show
     @member = User.find(params[:id])
     @updates = @member.updates
+    @garden = Garden.new # in case a new garden is created; not persisted yet
 
     respond_to do |format|
       format.html # show.html.haml
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index efea771d3..c5a2bb836 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -19,12 +19,12 @@
           %li{:class => first_garden ? 'active' : '' }
             - first_garden = false
             = link_to g.name, "#garden#{g.id}", 'data-toggle' => 'tab'
-        %li= link_to  'New garden', new_garden_path
+        %li= link_to 'New garden', '#garden_new', 'data-toggle' => 'tab'
       .tab-content
         - first_garden = true
         - @member.gardens.each do |g|
 
-          %div{:class => ['tab-pane', first_garden ? 'active' : ''], :id => "#garden#{g.id}"}
+          %div{:class => ['tab-pane', first_garden ? 'active' : ''], :id => "garden#{g.id}"}
             - first_garden = false
             .alert
               %button.close{:type => 'button', 'data-dismiss' => 'alert'} ×
@@ -41,7 +41,9 @@
                 - @crop = random_crop
                 = @crop ? link_to(@crop.system_name, url_for(@crop)) : 'blah'
 
-            %p= link_to "More about #{@member.username}'s #{@member.gardens.first.name}...", url_for(@member.gardens.first)
+            %p= link_to "More about #{@member.username}'s #{g.name}...", url_for(g)
+        %div{:class => 'tab-pane', :id => "garden_new"}
+          = render 'gardens/form'
 
     %h3 Updates
     - @member.updates.each do |update|
diff --git a/spec/views/members/show.html.haml_spec.rb b/spec/views/members/show.html.haml_spec.rb
index 2851fd46c..3773192f8 100644
--- a/spec/views/members/show.html.haml_spec.rb
+++ b/spec/views/members/show.html.haml_spec.rb
@@ -10,6 +10,7 @@ describe "members/show" do
     )
     @time = @member.created_at
     @member.gardens.create(:name => 'My Garden', :user_id => @member.id)
+    @garden = Garden.new
     render
   end