From a994208ac25a6820dc93aaaee1143992ce0d62f3 Mon Sep 17 00:00:00 2001
From: futurechimp <dave@toaster>
Date: Sat, 4 Jun 2011 21:22:07 +0100
Subject: [PATCH] Improving the Feed creation form.

---
 admin/controllers/feeds.rb                    |  1 +
 admin/views/feeds/_form.erb                   | 24 +++++++++++++------
 admin/views/feeds/new.erb                     |  5 +++-
 .../admin/feeds_controller_test.rb            |  5 ++++
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/admin/controllers/feeds.rb b/admin/controllers/feeds.rb
index e54e354..7562468 100644
--- a/admin/controllers/feeds.rb
+++ b/admin/controllers/feeds.rb
@@ -6,6 +6,7 @@
   end
 
   get :new do
+    @wires = Wire.all
     @feed = Feed.new
     render 'feeds/new'
   end
diff --git a/admin/views/feeds/_form.erb b/admin/views/feeds/_form.erb
index 1db30b5..afcfca2 100644
--- a/admin/views/feeds/_form.erb
+++ b/admin/views/feeds/_form.erb
@@ -1,5 +1,6 @@
 <div class="group">
-  <%= f.label :default_moderation_status %><%= f.error_message_on :default_moderation_status %>
+  <%= f.label :default_moderation_status %>
+  <%= f.error_message_on :default_moderation_status %>
   <%= f.text_field :default_moderation_status, :class => :text_field %>
   <span class="description">Ex: a simple text</span>
 </div>
@@ -8,15 +9,24 @@
   <%= f.text_field :url, :class => :text_field %>
   <span class="description">Ex: a simple text</span>
 </div>
+
 <div class="group">
-  <%= f.label :_id %><%= f.error_message_on :_id %>
-  <%= f.text_field :_id, :class => :text_field %>
-  <span class="description">Ex: a simple text</span>
+  <%= f.label :wire %><%= f.error_message_on :wire %>
+  <%= f.select :wire_id, :collection => @wires, :fields => [:name, :id]  %>
+  <span class="description">Please choose a wire.</span>
 </div>
+
+<% if @feed and @feed.image_url %>
+  <div class="group">
+    <strong>Current default image:</strong> <br />
+    <%= image_tag @feed.image_url("small") if @feed.image_url %>
+  </div>
+<% end %>
+
 <div class="group">
-  <%= f.label :_type %><%= f.error_message_on :_type %>
-  <%= f.text_field :_type, :class => :text_field %>
-  <span class="description">Ex: a simple text</span>
+  <%= label_tag :image %><%= f.error_message_on :image %>
+  <%= file_field_tag :image %>
+  <span class="description">Please upload a default image</span>
 </div>
 
 <div class="group navform wat-cf">
diff --git a/admin/views/feeds/new.erb b/admin/views/feeds/new.erb
index 5824b09..e90b163 100644
--- a/admin/views/feeds/new.erb
+++ b/admin/views/feeds/new.erb
@@ -8,8 +8,11 @@
   <div class="content">
     <h2 class="title"><%= pat(:new) %> <% mt(:feed) %></h2>
     <div class="inner">
-      <% form_for :feed, url(:feeds, :create), :class => :form do |f| %>
+      <% form_for :feed, url(:feeds, :create), :class => :form, 
+            :multipart => :true do |f| %>
+            
         <%= partial "feeds/form", :locals => { :f => f } %>
+        
       <% end %>
     </div>
   </div>
diff --git a/test/app/controllers/admin/feeds_controller_test.rb b/test/app/controllers/admin/feeds_controller_test.rb
index 9afbb94..34e36a1 100644
--- a/test/app/controllers/admin/feeds_controller_test.rb
+++ b/test/app/controllers/admin/feeds_controller_test.rb
@@ -23,6 +23,7 @@ class Admin::FeedsControllerTest < Test::Unit::TestCase
 
     context "on GET to new" do
       setup do
+        @wire = Factory.make_wire
         get '/admin/feeds/new'
       end
 
@@ -30,6 +31,10 @@ class Admin::FeedsControllerTest < Test::Unit::TestCase
         assert last_response.ok?
         assert_match /New/, last_response.body
       end
+      
+      should "insert the @wire name into the body" do
+        assert last_response.body.include?(@wire.name)
+      end
     end
 
     context "on GET to edit" do