scrivito_crm_form_widget 0.8.0.beta3 → 0.9.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d07be5acb98945f87dc419993629c52c7d897a56
-  data.tar.gz: 215c64aa2a1fce50a99d60d66be90b8913428e74
+  metadata.gz: 4569ddbae114e16cb7d17dc8e8d2857b0ebc62da
+  data.tar.gz: 262ecd566b718f014b97b5ffc4ee6cc2f71aac55
 SHA512:
-  metadata.gz: a23a04e363b4d1f8842bbf103389feade3b673030bf2ef1b6184cfba3e337b0d346f65b6d8253227d6314137b183b8aba9f3d60df32d63a783d046e213b85932
-  data.tar.gz: b305c996c6920f4efad293d595bfc98539c027d5f14abb9b202352e0ce6c4c64049fd929710222d1ec38e30360c7b39cb671ef6bd7f9b3adf171c965cb11a784
+  metadata.gz: a6081661f981e78cd231405670b376559913d60bc2521fa71ff8dd285c594139aa019df5bcea30b78097264a12fbc4d6b50064a699e198182dbc64d1989f1292
+  data.tar.gz: b71cb0354e2f52ea1bd027d5e39aa7b5ead25219c96d866271820bff830ed0311e12612cc8c3ccce535fe7a89ad6678589dfd6a56b5bcc839ff7b67b4ea040f1

data/app/models/crm_form_widget.rb

@@ -11,6 +11,8 @@ class CrmFormWidget < Widget
   attribute :label_position, :enum, values: ['left','top'], default: 'left'
   attribute :columns, :enum, values: ['one','two'], default: 'one'
 
+  attribute :file_upload, :enum, values: ['Yes','No'], default: 'No'
+
   def valid_widget_classes_for(field_name)
     [DynamicAttributeWidget]
   end
@@ -58,4 +60,8 @@ class CrmFormWidget < Widget
   def field_as_select?(options)
     columns == 'two' || options['valid_values'].count > 5
   end
-end
+
+  def file_upload?
+    file_upload == 'Yes'
+  end
+end

data/app/presenter/crm_form_presenter.rb

@@ -37,6 +37,11 @@ class CrmFormPresenter
   private
   def prepare_activity_params
     @params[:comment_notes] = @dynamic_params if @dynamic_params.present?
+    @params[:comment_attachments] = [@params[:custom_file]] if @params[:custom_file].present?
+
+    if @params[:custom_file].present?
+      @params.delete(:custom_file)
+    end
 
     @params.delete("widget_id")
     @params["title"] = @params[:title].empty? ? @activity.id : @params[:title]
@@ -124,12 +129,12 @@ class CrmFormPresenter
 
   def validate_params
     return false if @params.nil?
-    email = validate_email(@params['custom_email'])
+    email = valid_email?(@params['custom_email'])
     hook = Obj.respond_to?('crm_form_validation') ? Obj.crm_form_validation(@params) : false
-    email || hook
+    !email || hook
   end
 
-  def validate_email(email)
-    email.present? ? /.+@.+\..+/i.match(email).present? : false
+  def valid_email?(email)
+    /.+@.+\..+/i.match(email).present?
   end
 end

data/app/views/crm_form_widget/_form.html.erb

@@ -15,12 +15,22 @@
     <%= render "crm_form_widget/crm_#{attribute.type}", form: form, name: attribute.field_name, options: attribute.options || {}, label: attribute.label, widget: widget %>
   <% end %>
 
+  <% if widget.file_upload? %>
+    <div class="form-group form-field-custom-file">
+      <% CrmFormPresenter.send(:attr_accessor, :custom_file) %>
+      <%= form.label :custom_file, t('scrivito_crm_form_widget.view.file', default: 'File'), class: "control-label col-sm-3" %>
+      <div class="col-sm-9">
+        <%= form.file_field :custom_file, class: "form-control" %>
+      </div>
+    </div>
+  <% end %>
+
   <div class="form-group last">
     <label class="control-label col-sm-3" for="crm_form_presenter_email">Email</label>
     <div class="col-sm-9">
       <input class="form-control" type="text" name="crm_form_presenter[email]" id="crm_form_presenter_email">
     </div>
   </div>
-  <%= form.submit widget.submit_button, class: "btn btn-primary pull-right" %>
 
-<% end %>
+  <%= form.submit widget.submit_button, class: "btn btn-primary pull-right" %>
+<% end %>

data/app/views/crm_form_widget/details.html.erb

@@ -27,6 +27,10 @@
       <%= scrivito_details_for t('scrivito_crm_form_widget.details.columns', default: 'Columns') do %>
         <%= scrivito_tag :div, widget, :columns %>
       <% end %>
+
+      <%= scrivito_details_for t('scrivito_crm_form_widget.details.file_upload', default: 'File upload') do %>
+        <%= scrivito_tag :div, widget, :file_upload %>
+      <% end %>
     </div>
 
     <div class="tab-panel" id="edit-tags">

data/lib/scrivito_crm_form_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoCrmFormWidget
-  VERSION = "0.8.0.beta3"
+  VERSION = "0.9.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_crm_form_widget
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta3
+  version: 0.9.0.beta1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivito