[Fix browsermedia#723] Deleting Form Entries works

Author: peakpg

.ruby-gemset

@@ -1 +1 @@
-rails_4.0
+browsercms

Gemfile

@@ -19,7 +19,7 @@ end
 
 group :development do
  gem 'rake'
- gem 'debugger'
+ # gem 'debugger'
  gem 'quiet_assets'
 end
 group :test, :development do

Gemfile.lock

@@ -78,7 +78,6 @@ GEM
  activesupport (>= 3.0)
  cocaine (0.5.3)
  climate_control (>= 0.0.3, < 1.0)
- columnize (0.3.6)
  compass (0.12.2)
  chunky_png (~> 1.2)
  fssm (>= 0.2.7)
@@ -97,12 +96,6 @@ GEM
  nokogiri (>= 1.5.0)
  daemons (1.1.9)
  database_cleaner (1.2.0)
- debugger (1.6.2)
- columnize (>= 0.3.1)
- debugger-linecache (~> 1.2.0)
- debugger-ruby_core_source (~> 1.2.3)
- debugger-linecache (1.2.0)
- debugger-ruby_core_source (1.2.3)
  devise (3.2.2)
  bcrypt-ruby (~> 3.0)
  orm_adapter (~> 0.1)
@@ -259,7 +252,6 @@ DEPENDENCIES
  cucumber
  cucumber-rails
  database_cleaner
- debugger
  factory_girl_rails (= 3.3.0)
  launchy
  m (~> 1.2)

app/controllers/cms/form_entries_controller.rb

@@ -32,14 +32,31 @@ def submit
  end
  end
 
+ def bulk_update
+ # Duplicates ContentBlockController#bulk_update
+ ids = params[:content_id] || []
+ models = ids.collect do |id|
+ FormEntry.find(id.to_i)
+ end
+ 
+ if params[:commit] == 'Delete'
+ deleted = models.select do |m|
+ m.destroy
+ end
+ flash[:notice] = "Deleted #{deleted.size} records."
+ end
+ 
+ redirect_to entries_path(params[:form_id])
+ end
+ 
  # Same behavior as ContentBlockController#index
  def index
- form = Cms::Form.where(id: params[:id]).first
+ @form = Cms::Form.where(id: params[:id]).first
  @blocks = Cms::FormEntry.where(form_id: params[:id]).paginate({page: params[:page], order: params[:order]})
- @entry = Cms::FormEntry.for(form)
+ @entry = Cms::FormEntry.for(@form)
 
  # Allows us to use the content_block/index view
- @content_type = FauxContentType.new(form)
+ @content_type = FauxContentType.new(@form)
  @search_filter = SearchFilter.build(params[:search_filter], Cms::FormEntry)
  @total_number_of_items = @blocks.size
  end
@@ -115,5 +132,6 @@ def columns_for_index
  def content_type
  @content_type
  end
+ 
  end
 end

app/views/cms/form_entries/index.html.erb

@@ -1,4 +1,5 @@
 <% content_for :bulk_actions do %>
  <%= render 'buttons' %>
+<%= hidden_field_tag :form_id, @form.id %>
 <% end %>
 <%= render file: 'cms/content_block/index' %>

config/routes.rb

@@ -94,7 +94,7 @@
  post :submit
  end
  end
-
+ put "/form_entries" => "form_entries#bulk_update"
  # Faux nested resource for forms (not sure if #content_blocks allows for it.)
  get 'forms/:id/entries' => 'form_entries#index', as: 'entries'
 

features/content_blocks/forms.feature

@@ -1,7 +1,7 @@
 Feature: Forms
 
  Editors should be able to create and manage forms to collect information from site visitors. They should be able
- to build these forms dyamically through the UI.
+ to build these forms dynamically through the UI.
 
  Background:
  Given I am logged in as a Content Editor