Add better default for file_field :label

Added josiahivey's change to add a more reasonable default for cms_file_field. Had to rework slightly so that <label for=> will correctly match the file. Update features.

Author: peakpg

app/helpers/cms/form_builder.rb

@@ -66,12 +66,16 @@ def cms_label(field, label_value)
  #
  # @param [Symbol] method The name of the model this form upload is associated with
  # @param [Hash] options
- # @option options [String] :label (Data)
+ # @option options [String] :label (method) If no label is specified, the human readable name for method will be used.
  # @option options [String] :instructions (blank) Helpful tips for the person entering the field, appears blank if nothing is specified.
  # @option options [Boolean] :edit_path (false) If true, render a text field to allow users to edit path for this file.
  # @option options [Boolean] :edit_section (false) If true, render a select box which allows users to choose which section this attachment should be placed in.
  def cms_file_field(method, options={})
  @object.ensure_attachment_exists if @object.respond_to?(:ensure_attachment_exists)
+
+ unless options[:label]
+ options[:label] = method.to_s.humanize
+ end
  render_form_field("file_field", method, options)
  end
 

app/views/cms/file_blocks/_form.html.erb

@@ -1,5 +1,5 @@
 <%= f.cms_text_field :name %>
-<%= f.cms_file_field :file, :label => "File", :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
+<%= f.cms_file_field :file, :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
 <%= f.cms_tag_list %>
 
 

app/views/cms/form_builder/_cms_file_field.html.erb

@@ -10,7 +10,7 @@
  <% if a.object.attachment_name == method.to_s %>
  <%= a.hidden_field :attachment_name, :value => method.to_s %>
  <div class="fields file_fields">
- <%= a.cms_label method, cms_options[:label] %>
+ <%= a.cms_label :data, cms_options[:label] %>
  <div id="<%= object_name %>_<%= method %>_div" class="file_inputs">
  <%= a.file_field :data, options.merge('data-purpose'=>"cms_file_field") %>
  </div>

app/views/cms/image_blocks/_form.html.erb

@@ -1,3 +1,3 @@
 <%= f.cms_text_field :name %>
-<%= f.cms_file_field :file, :label => "File", :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
+<%= f.cms_file_field :file, :label => "Image", :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
 <%= f.cms_tag_list %>

features/content_blocks/add_images.feature

@@ -12,7 +12,7 @@ Feature: Image Blocks
 
  Scenario: Creating image block
  When I fill in "Name" with "Giraffe"
- And I attach the file "test/fixtures/giraffe.jpeg" to "File"
+ And I upload an image named "test/fixtures/giraffe.jpeg"
  And I select "My Site" from "section_id"
  And I fill in "Path" with "/giraffe.jpeg"
  And I Save And Publish
@@ -32,15 +32,15 @@ Feature: Image Blocks
 
  Scenario: Missing Path
  When I fill in "Name" with "Giraffe"
- When I attach the file "test/fixtures/giraffe.jpeg" to "File"
+ And I upload an image named "test/fixtures/giraffe.jpeg"
  And I Save And Publish
  Then I should see "Path can't be blank"
 
  Scenario: With Existing Path
  Given an image with path "/giraffe.jpeg" exists
  And I am adding a New Image
  When I fill in "Name" with "Giraffe"
- And I attach the file "test/fixtures/giraffe.jpeg" to "File"
+ And I upload an image named "test/fixtures/giraffe.jpeg"
  And I fill in "Path" with "/giraffe.jpeg"
  When I Save And Publish
  Then I should see "Path must be unique."

features/content_blocks/form_controls.feature

@@ -6,13 +6,17 @@ Feature: Form Controls
  Background: 
  Given I am logged in as a Content Editor
 
- Scenario: File Field Helper
+ Scenario: Default File Field
  Given I am adding a new File
  Then I should see a label named "File"
  And I should see a file upload button
  And I should see the following instructions:
  | Select a file to upload |
 
+ Scenario: Setting a label named 'Name' for File Field
+ Given I am adding a New Image
+ Then I should see a label named "Image"
+
  Scenario: Multiple Individual Attachments
  Given I am creating a new block which has two attachments
  Then I should see two file uploads
@@ -35,3 +39,4 @@ Feature: Form Controls
 
 
 
+

features/step_definitions/form_control_steps.rb

@@ -39,6 +39,10 @@ def create_new_product(upload_both_files=true)
  @block = Product.last
 end
 
+When /^I upload an image named "([^"]*)"$/ do |path|
+ attach_file("Image", File.expand_path(path))
+end
+
 When /^I edit that block$/ do
  visit "/cms/#{@block.class.path_name}/#{@block.id}/edit"
 end

features/step_definitions/image_steps.rb

@@ -69,7 +69,7 @@
  visit '/cms/image_blocks/new'
  fill_in "Name", :with => "Giraffe"
  fill_in "Path", :with => path
- attach_file "File", "test/fixtures/giraffe.jpeg"
+ attach_file "Image", "test/fixtures/giraffe.jpeg"
  click_button "true"
 end
 

features/step_definitions/web_steps.rb

@@ -102,6 +102,7 @@ def with_scope(locator)
  attach_file(field, File.expand_path(path))
 end
 
+
 Then /^(?:|I )should see "([^"]*)"$/ do |text|
  if page.respond_to? :should
  page.should have_content(text)