cama_contact_form 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 320176081f13bd7f2cc54f68388aaa20dee423d9
-  data.tar.gz: 99b5cf2de7775901cb12c1160cc47b721e7474b8
+  metadata.gz: 56a1f3b2dbf7548b7d7df03c022f6c8a579efda2
+  data.tar.gz: 60a0c6fd4f812006e731645706e6b2c441a80a8d
 SHA512:
-  metadata.gz: a2a2d225613fc07bb11bae080d1a39a5e87faa09a5b6e27569cb2c7c851ea2eb27eceb5484b764268b209cebc1d63f7dcfdeda704d9b8bedbff2547f2b5347c9
-  data.tar.gz: 155627810d2343de307b279aa35f9a3e1fbf6fd30b5b940db7bbdfe206c7e496c195e67a0e000b11ba754b103e1245e05df6a60a4bd60dfb0b241913d411af24
+  metadata.gz: 09fb7126f7fc4ba29ddd34897452cc8f8c299f325f63914c47e40faea0bad9694d91c5a0cfdec9ac28116b12fc287ffd7a572f2152318bd64c00a5cf3befa1cd
+  data.tar.gz: 609643dd8b917db9f669353a0cf418827416196174d33276c2440c9bbc88560392e3fbccc86484d133184117d530b1f547a61176983065e2e6ac9965784ff703

data/app/controllers/concerns/plugins/cama_contact_form/contact_form_controller_concern.rb

@@ -73,7 +73,7 @@ module Plugins::CamaContactForm::ContactFormControllerConcern
       elsif field[:field_type] == 'captcha'
         values[label] << '--'
       elsif field[:field_type] == 'radio' || field[:field_type] == 'checkboxes'
-        values[label] << fields[cid].join(',') if fields[cid].present?
+        values[label] << fields[cid].map { |f| f.to_s.translate }.join(', ') if fields[cid].present?
       else
         values[label] << fields[cid] if fields[cid].present?
       end

data/app/controllers/plugins/cama_contact_form/admin_forms_controller.rb

@@ -49,7 +49,7 @@ class Plugins::CamaContactForm::AdminFormsController < CamaleonCms::Apps::Plugin
     add_breadcrumb I18n.t("plugins.cama_contact_form.list_responses", default: 'Contact form records')
     @form = current_site.contact_forms.where({id: params[:admin_form_id]}).first
     values = JSON.parse(@form.value).to_sym
-    @op_fields = values[:fields]
+    @op_fields = values[:fields].select{ |field| relevant_field? field }
     @forms = current_site.contact_forms.where({parent_id: @form.id})
     @forms = @forms.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
   end
@@ -72,4 +72,8 @@ class Plugins::CamaContactForm::AdminFormsController < CamaleonCms::Apps::Plugin
       redirect_to cama_admin_path
     end
   end
+
+  def relevant_field?(field)
+    !%w(captcha submit button).include? field[:field_type]
+  end
 end

data/app/controllers/plugins/cama_contact_form/front_controller.rb

@@ -17,7 +17,7 @@ class Plugins::CamaContactForm::FrontController < CamaleonCms::Apps::PluginsFron
       flash[:contact_form][:error] = errors.join('<br>')
       flash[:values] = fields.delete_if{|k, v| v.class.name == 'ActionDispatch::Http::UploadedFile' }
     end
-    params[:format] == 'json' ? render(json: flash[:contact_form].to_hash) : (redirect_to :back)
+    params[:format] == 'json' ? render(json: flash.discard(:contact_form).to_hash) : (redirect_to :back)
   end
 
 end

data/app/models/plugins/cama_contact_form/cama_contact_form.rb

@@ -10,6 +10,8 @@ class Plugins::CamaContactForm::CamaContactForm < ActiveRecord::Base
   before_validation :before_validating
   before_create :fix_save_settings
 
+  default_scope { order(created_at: :desc) }
+
   # [{"label":"Untitled","field_type":"text","required":true,"field_options":{"size":"large","field_class":"Default"},"cid":"c2"},{"label":"Untitled","field_type":"paragraph","required":true,"field_options":{"size":"large","field_class":"Default"},"cid":"c6"},{"label":"Untitled","field_type":"captcha","required":true,"field_options":{"field_class":"Default"},"cid":"c10"},{"label":"Untitled","field_type":"checkboxes","required":true,"field_options":{"options":[{"label":"Default","checked":false},{"label":"Default","checked":false}],"field_class":"Default","description":"description\n"},"cid":"c12"}]
   def fields
     @_the_fields ||= JSON.parse(self.value || '{fields: []}').with_indifferent_access

data/app/views/plugins/cama_contact_form/admin_forms/responses.html.erb

@@ -33,7 +33,7 @@
                     <% if default[:field_type] == "file" %>
                         <td><%= link_to(value[:fields][cid], value[:fields][cid]) %></td>
                     <% elsif default[:field_type] == "radio" || default[:field_type] == "checkboxes" %>
-                        <td><%= value[:fields][cid].map(&:inspect).join(', ') if value[:fields][cid].present? %></td>
+                        <td><%= value[:fields][cid].map { |f| f.to_s.translate }.join(', ') if value[:fields][cid].present? %></td>
                     <% else %>
                         <td><%= value[:fields][cid] %></td>
                     <% end %>

data/lib/cama_contact_form/version.rb

@@ -1,3 +1,3 @@
 module CamaContactForm
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cama_contact_form
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Owen Peredo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Contact Form Plugin for Camaleon CMS
@@ -168,4 +168,3 @@ test_files:
 - test/dummy/README.rdoc
 - test/integration/navigation_test.rb
 - test/test_helper.rb
-has_rdoc: