Connect plantings to photos.

app/controllers/photos_controller.rb

@@ -26,6 +26,7 @@ class PhotosController < ApplicationController
   # GET /photos/new.json
   def new
     @photo = Photo.new
+    @planting_id = params[:planting_id]
 
     @flickr_auth = current_member.auth('flickr')
     if @flickr_auth
@@ -50,6 +51,12 @@ class PhotosController < ApplicationController
       Photo.new(params[:photo])
     @photo.owner_id = current_member.id
     @photo.set_flickr_metadata
+    if params[:planting_id]
+      planting = Planting.find_by_id(params[:planting_id])
+      if planting
+        @photo.plantings << planting
+      end
+    end
 
     respond_to do |format|
       if @photo.save

app/views/photos/new.html.haml

@@ -15,7 +15,7 @@
       - c += 1
       %li.span2
         .thumbnail(style='height: 220px')
-          = link_to image_tag(FlickRaw.url_q(p), :alt => '', :class => 'img-rounded'), photos_path(:photo => { :flickr_photo_id => p.id }), :method => :post
+          = link_to image_tag(FlickRaw.url_q(p), :alt => '', :class => 'img-rounded'), photos_path(:photo => { :flickr_photo_id => p.id }, :planting_id => @planting_id), :method => :post
           %p
             =p.title
       - if (c % 6) == 0

app/views/plantings/show.html.haml

@@ -51,6 +51,9 @@
   - (1..6).each do
     .span2
       = image_tag('http://placehold.it/150x150', :alt => '', :class => 'img-rounded')
+- if can? :create, Photo and can? :edit, @planting
+  %p
+    = link_to "Add photo", new_photo_path(:planting_id => @planting.id)
 
 %h2
   Notes

spec/controllers/photos_controller_spec.rb

@@ -51,6 +51,11 @@ describe PhotosController do
       get :new, {}
       assigns(:photo).should be_a_new(Photo)
     end
+
+    it "assigns a planting id" do
+      get :new, { :planting_id => 5 }
+      assigns(:planting_id).should eq "5"
+    end
   end
 
   describe "GET edit" do
@@ -89,6 +94,13 @@ describe PhotosController do
         post :create, {:photo => { :flickr_photo_id => 1 } }
         response.should redirect_to(Photo.last)
       end
+
+      it "attaches the photo to a planting" do
+        planting = FactoryGirl.create(:planting)
+        post :create, {:photo => { :flickr_photo_id => 1 },
+          :planting_id => planting.id }
+        Photo.last.plantings.first.should eq planting
+      end
     end
 
     describe "for the second time" do