cama_contact_form 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac9d232c087c6da9750c56fa75175057b06d9bdb
-  data.tar.gz: bc3a4141e2239b671ec0d8335613f8a55567251d
+  metadata.gz: 79f5408cc5871edfdbd3ed0fb697114eeb2e25c3
+  data.tar.gz: 23273662b1911e32621c4620a4653a940a950acc
 SHA512:
-  metadata.gz: bf3c887a2ba812faba249df7680612c59de3b7c4beddecdcfcbe9fa580a3513a70751505777b39a1f046842c8d36023f67a47ec2fe688a781d0dcc8f38901d0c
-  data.tar.gz: d83aec5505ce3f3263dee5a0d8dba3024998a5e537fab9f1b2bc003b24a47f4cfbfb490cba39cde05c8105215c26ff50ba378aca9bb5e6821acfe0fadbb77029
+  metadata.gz: 42a40daf5a2f72c7a25f2ba0fd165c7440443fa2023b554f74c38b4587b918e27ceb6be770c516a3773d53aec00645e0833ccfdb09b58825060ab29827441406
+  data.tar.gz: 4c5e6aaa633869ea020f8c1adea7c852cedd41acfe9287607b91d64f2d6b77c8f04bf50b1fafd553e663b33834ca6f122000e60599133f83ce8480b2fa6f6d04

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

@@ -64,20 +64,23 @@ module Plugins::CamaContactForm::ContactFormControllerConcern
   def convert_form_values(form, fields)
     values = {}
     form.fields.each do |field|
+      next unless relevant_field?(field)
+      ft = field[:field_type]
       cid = field[:cid].to_sym
       label = values.keys.include?(field[:label]) ? "#{field[:label]} (#{cid})" : field[:label].to_s.translate
       values[label] = []
-      if field[:field_type] == 'submit' || field[:field_type] == 'button'
-      elsif field[:field_type] == 'file'
+      if ft == 'file'
         values[label] << fields[cid].split('/').last if fields[cid].present?
-      elsif field[:field_type] == 'captcha'
-        values[label] << (params[:captcha] rescue '')
-      elsif field[:field_type] == 'radio' || field[:field_type] == 'checkboxes'
+      elsif ft == 'radio' || ft == 'checkboxes'
         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
     end
-    return values
+    values
+  end
+
+  def relevant_field?(field)
+    !%w(captcha submit button).include? field[:field_type]
   end
 end

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

@@ -1,5 +1,6 @@
 class Plugins::CamaContactForm::AdminFormsController < CamaleonCms::Apps::PluginsAdminController
   include Plugins::CamaContactForm::MainHelper
+  include Plugins::CamaContactForm::ContactFormControllerConcern
   before_action :set_form, only: ['show','edit','update','destroy']
   add_breadcrumb I18n.t("plugins.cama_contact_form.title", default: 'Contact Form'), :admin_plugins_cama_contact_form_admin_forms_path
 
@@ -80,8 +81,4 @@ 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/helpers/plugins/cama_contact_form/main_helper.rb

@@ -139,15 +139,16 @@ module Plugins::CamaContactForm::MainHelper
     end
 
     options.each do |op|
+      label = op[:label].translate
       if type == "radio" || type == "checkbox"
         html += "<div class=\"#{type} #{ob[:custom_class]}\">
                     <label for=\"#{ob[:cid]}\">
-                      <input #{ob[:custom_attrs].to_attr_format} type=\"#{type}\" #{'checked' if op[:checked].to_s.cama_true?} name=\"#{f_name}[]\" class=\"\" value=\"#{op[:label].downcase}\">
-                      #{op[:label]}
+                      <input #{ob[:custom_attrs].to_attr_format} type=\"#{type}\" #{'checked' if op[:checked].to_s.cama_true?} name=\"#{f_name}[]\" class=\"\" value=\"#{label.downcase}\">
+                      #{label}
                     </label>
                   </div>"
       else
-        html += "<option  value=\"#{op[:label].downcase.gsub(" ", "_")}\" #{"selected" if "#{op[:label].downcase.gsub(" ", "_")}" == values[cid] || op[:checked].to_s.cama_true? } >#{op[:label]}</option>"
+        html += "<option  value=\"#{label.downcase.gsub(" ", "_")}\" #{"selected" if "#{label.downcase.gsub(" ", "_")}" == values[cid] || op[:checked].to_s.cama_true? } >#{label}</option>"
       end
     end
 

data/lib/cama_contact_form/version.rb

@@ -1,3 +1,3 @@
 module CamaContactForm
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cama_contact_form
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Owen Peredo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails