scrivito_crm_form_widget 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61d8010804a45532c3f11197e5d06246b4e11af0
-  data.tar.gz: 92dd9c97509bf20c400931907b4734fa42d66239
+  metadata.gz: e48c991510dbb7f2bd41769819ae6395d8628956
+  data.tar.gz: 57d54427d0a32c779b4b3a503c1a849d6df91462
 SHA512:
-  metadata.gz: 172167c6bd997f23fdd63dbca8a548bb1192c4be39ffc76f3d54d63db249a22aaf1ea3abfa960f488a6691029af51449f1b9b5330837e0a98fb9d81afe89a162
-  data.tar.gz: 2588fa8bd49632eefc827f443e4147dd6c7fb9a57d638ed4c1696844de6fd56b80929a71dee28660092649170e99f6f7575411f9a5f442c460c159a8016a5fb3
+  metadata.gz: b9062a54e33e98e979734ac7534041e2b06aa950332c868da18f42194b04b97cec69951c77922693cedf505ddb823959f1bfc0c656affef65ecf31351c9d7b2e
+  data.tar.gz: f4b6b5a1acbf9ae3ea29066b6d877b44307e8b43e2261fe495108edb7040e6d3998bd7ed1814e3cec1443964c6719db23319f66fd8b4299d873bed49358fe6bf

data/app/presenter/crm_form_presenter.rb

@@ -11,11 +11,13 @@ class CrmFormPresenter
     @page = widget.obj
     @params = request.params["crm_form_presenter"]
     @dynamic_params = set_dynamic_params
+    @access_code = generate_random_string(12)
     errors = validate_params
 
     if errors.present?
       return {status: "error", message: errors}
     elsif request.post? && widget.id == @params[:widget_id]
+      request.session['access_via_form'] = @access_code
       redirect_after_submit(controller, widget, self.submit)
     end
   end
@@ -26,6 +28,8 @@ class CrmFormPresenter
     else
       @params.delete('email')
     end
+    @params.delete('access_via_form')
+
     prepare_contact(@params['custom_email'], @params['custom_last_name'])
     prepare_activity_params
     Crm::Activity.create(@params)
@@ -112,7 +116,7 @@ class CrmFormPresenter
 
   def redirect_path(page, widget)
     obj = redirect_obj(page, widget)
-    obj.binary? ? obj.try(:binary_url) : "/#{obj.id}"
+    obj.binary? ? obj.try(:binary_url) : "/#{obj.id}?access_via_form=#{@access_code}"
   end
 
   def redirect_obj(page, widget)
@@ -137,4 +141,8 @@ class CrmFormPresenter
   def valid_email?(email)
     /.+@.+\..+/i.match(email).present?
   end
+
+  def generate_random_string(length = 8)
+    [*('a'..'z'),*('0'..'9')].shuffle[0,length].join
+  end
 end

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

@@ -1,4 +1,6 @@
 <% attributes.each do |name, options| %>
   <% CrmFormPresenter.send(:attr_accessor, name.to_sym) %>
-  <%= render "crm_form_widget/crm_#{options["attribute_type"]}", form: form, name: name, options: options, label: nil, widget: widget %>
+  <% if options %>
+    <%= render "crm_form_widget/crm_#{options["attribute_type"]}", form: form, name: name, options: options, label: nil, widget: widget %>
+  <% end %>
 <% end %>

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

@@ -6,7 +6,7 @@
     <li data-panel-target="#edit-activity">Activity</li>
     <li data-panel-target="#edit-event">Event</li>
     <li data-panel-target="#edit-dynamic">Dynamic fields</li>
-    <% if widget.multilevel? %>
+    <% if widget.multilevel? && widget.activity_id.present? %>
       <li data-panel-target="#edit-multilevel">Levels</li>
     <% end %>
   </ul>
@@ -73,7 +73,7 @@
 
     <div class="tab-panel" id="edit-activity">
       <%= scrivito_details_for t('scrivito_crm_form_widget.details.activity', default: 'Activity') do %>
-        <%= scrivito_tag(:div, widget, :activity_id, data: {toggle_button_list: CrmFormWidget.activity_ids}) %>
+        <%= scrivito_tag(:div, widget, :activity_id, data: {toggle_button_list: CrmFormWidget.activity_ids, scrivito_editors_reload: true }) %>
       <% end %>
     </div>
 
@@ -89,7 +89,7 @@
       <%= scrivito_tag :div, widget, :dynamic_attributes %>
     </div>
 
-    <% if widget.multilevel? %>
+    <% if widget.multilevel? && widget.activity_id.present? %>
       <div class="tab-panel" id="edit-multilevel">
         <%= scrivito_tag :div, widget, :levels %>
       </div>

data/lib/scrivito_crm_form_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoCrmFormWidget
-  VERSION = "1.0.0.beta1"
+  VERSION = "1.0.0.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_crm_form_widget
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivito