maestrano-connector-rails 2.0.2.pre.RC7 → 2.0.2.pre.RC8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf0aeacbcf0ade3ddda62e58c84aef2f464e49af
-  data.tar.gz: fc0deb05247177b49871feb5e35a24a2058e035a
+  metadata.gz: 037d652344e79e969e039b5965d77d60d8f37bf9
+  data.tar.gz: f2efcc1b388d1b79208b0785bebcac84a0583fa5
 SHA512:
-  metadata.gz: abca8484da1b3604d0a78d53cdb172958e03bfc220bbd19d56f668cbbb2ada649484ed299f8578a30544b2c4467e9cff591eaacb973b67d4d6f5c6151a610a0d
-  data.tar.gz: 713daa98e070d23f3a9ef15f183224b27310d95d9e295b8f3d6669c2a0acf993341591809ff57c9199161c23da2e43dc2ccdc703f5b56e69e91c556dd0f4d912
+  metadata.gz: 20063103324a253d004d6dde4ba740233ecacb552e43ca4e3f39fcadaed0977d238d4e8a34295460fdfd9c8c075b9d34e798d362a1210fbb50943bec0ebf6819
+  data.tar.gz: 640ab1729b3c3e4713faf6225e6c85c9737ffa74f1cf4db8582ab1c04c5f2ef370b7789e2c4b36957aa1b5eb3edfc243cac0eb23e44615dffb643cd683bbf6bc

data/Gemfile

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
 gemspec
-# Add dependencies to develop your gem here.
 
+# Add dependencies to develop your gem here.
 group :development do
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'sqlite3', platforms: :ruby

data/app/models/maestrano/connector/rails/concerns/entity.rb

@@ -135,7 +135,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
       true
     end
 
-    def currency_check_field
+    def currency_check_fields
       nil
     end
 
@@ -266,12 +266,14 @@ module Maestrano::Connector::Rails::Concerns::Entity
       mapped_external_entities_with_idmaps.select! { |mapped_external_entity_with_idmap| !mapped_external_entity_with_idmap[:idmap].connec_id }
     end
 
-    if self.class.currency_check_field
-      mapped_external_entities_with_idmaps.each { |mapped_external_entity_with_idmap|
+    if self.class.currency_check_fields
+      mapped_external_entities_with_idmaps.each do |mapped_external_entity_with_idmap|
         id_map = mapped_external_entity_with_idmap[:idmap]
         next unless id_map&.metadata&.dig(:ignore_currency_update)
-        mapped_external_entity_with_idmap[:entity].delete(self.class.currency_check_field)
-      }
+        self.class.currency_check_fields.each do |field|
+          mapped_external_entity_with_idmap[:entity].delete(field)
+        end
+      end
     end
 
     proc = ->(mapped_external_entity_with_idmap) { batch_op('post', mapped_external_entity_with_idmap[:entity], nil, self.class.normalize_connec_entity_name(connec_entity_name)) }

data/lib/generators/connector/templates/home.js

@@ -2,6 +2,7 @@ function historicalDataDisplay()
 {
   if (document.getElementById('historical-data').checked)
   {
+      $('#myModal').modal('show');
       document.getElementById('historical-data-display-checked').style.display = 'block';
       document.getElementById('historical-data-display-unchecked').style.display = 'none';
   } else {
@@ -10,6 +11,25 @@ function historicalDataDisplay()
   }
 }
 
+var checkHistorical
+
+function closeModal(sender)
+{
+  checkHistorical = sender.id == 'confirm'
+  $('#myModal').modal('hide');
+}
+
+$(document).ready(function(){
+    $("#myModal").on('hidden.bs.modal', function (e) {
+      if (!checkHistorical) {
+		document.getElementById('historical-data').checked = false
+		historicalDataDisplay()
+      }
+      checkHistorical = false
+    });
+});
+
+
 $(function () {
   $('[data-toggle="tooltip"]').tooltip()
 })

data/lib/generators/connector/templates/home_index.haml

@@ -55,7 +55,7 @@
                   .col-md-1
                     =image_tag "logos/to_external.png", class: "image"
                   .col-md-4
-                    Vend wording
+                    ApplicationName wording
                   .col-md-3
                     Universal wording
             .spacer1
@@ -85,6 +85,32 @@
               .col-md-4.col-md-offset-1
                 %label{:for => 'historical-data'} Synchronize my historical data
               .col-md-1
+                #myModal.modal.fade{:role => "dialog"}
+                  .modal-dialog
+                    .modal-content
+                      .modal-header
+                        %button.close{"data-dismiss" => "modal", :type => "button"} ×
+                        %h4.modal-title Warning!
+                      .modal-body
+                        %p
+                          %b All data
+                          created prior to the date you linked ApplicationName
+                          %b will be synchronised both ways.
+                        %p
+                          It means that:
+                          %br
+                          \- all data from applications you already have linked to the platform will be sent to your ApplicationName account
+                          %br
+                          \- all exisiting data from ApplicationName will be sent to your other applications
+                          %br
+                        %p
+                          If you have been manually copying records in multiple applications,
+                          %b you risk seeing duplicates arising!
+                        %p
+                          %b This action cannot be undone at any time!
+                      .modal-footer
+                        %button.btn.btn-primary{id: 'confirm', :type => "button", onclick: "closeModal(confirm);"}  Confirm
+                        %button.btn.btn-secondary{id: 'close', :type => "button", onclick: "closeModal(close);"} Close
                 %input{type: 'checkbox', id: 'historical-data', name: 'historical-data', checked: current_organization.historical_data, onchange: 'historicalDataDisplay();', disabled: current_organization.historical_data}
               .col-md-6
                 %small#historical-data-display-unchecked{style: "display: #{current_organization.historical_data ? 'none' : 'block'}"} Only data created after #{(current_organization.date_filtering_limit && current_organization.date_filtering_limit.utc || Time.now.utc).to_formatted_s(:long_ordinal)} will be synchronized

data/lib/maestrano/connector/rails/version.rb

@@ -1,7 +1,7 @@
 module Maestrano
   module Connector
     module Rails
-      VERSION = '2.0.2.pre.RC7'.freeze
+      VERSION = '2.0.2.pre.RC8'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2.pre.RC7
+  version: 2.0.2.pre.RC8
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -490,7 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails framework to build connector with Maestrano